[-] BO : error message on install module

This commit is contained in:
vAugagneur
2013-02-05 09:41:34 +01:00
74 changed files with 898 additions and 882 deletions
+4 -1
View File
@@ -274,7 +274,10 @@ abstract class InstallControllerHttp
*/
public function findNextStep()
{
return (isset(self::$steps[$this->getStepOffset($this->step) + 1])) ? self::$steps[$this->getStepOffset($this->step) + 1] : false;
$nextStep = (isset(self::$steps[$this->getStepOffset($this->step) + 1])) ? self::$steps[$this->getStepOffset($this->step) + 1] : false;
if ($nextStep == 'system' && self::$instances[$nextStep]->validate())
$nextStep = self::$instances[$nextStep]->findNextStep();
return $nextStep;
}
/**
+1 -1
View File
@@ -250,7 +250,7 @@ class InstallControllerHttpConfigure extends InstallControllerHttp
foreach ($top_countries as $iso)
$this->list_countries[] = array('iso' => $iso, 'name' => $countries[$iso]);
$this->list_countries[] = array('name' => '-----------------');
$this->list_countries[] = array('iso' => 0, 'name' => '-----------------');
foreach ($countries as $iso => $lang)
if (!in_array($iso, $top_countries))
+1
View File
@@ -1182,6 +1182,7 @@ CREATE TABLE `PREFIX_order_cart_rule` (
`name` varchar(254) NOT NULL,
`value` decimal(17,2) NOT NULL default '0.00',
`value_tax_excl` decimal(17,2) NOT NULL default '0.00',
`free_shipping` BOOLEAN NOT NULL DEFAULT FALSE,
PRIMARY KEY (`id_order_cart_rule`),
KEY `id_order` (`id_order`),
KEY `id_cart_rule` (`id_cart_rule`)
+86 -258
View File
@@ -8,434 +8,262 @@
</fields>
<entities>
<hook id="displayPayment" live_edit="1">
<name>displayPayment</name>
<title>Payment</title>
<description/>
<name>displayPayment</name><title>Payment</title><description>This hook displays new elements on the payment page</description>
</hook>
<hook id="actionValidateOrder" live_edit="0">
<name>actionValidateOrder</name>
<title>New orders</title>
<description/>
<name>actionValidateOrder</name><title>New orders</title><description/>
</hook>
<hook id="actionPaymentConfirmation" live_edit="0">
<name>actionPaymentConfirmation</name>
<title>Payment confirmation</title>
<description/>
<name>actionPaymentConfirmation</name><title>Payment confirmation</title><description>This hook displays new elements after the payment is validated</description>
</hook>
<hook id="displayPaymentReturn" live_edit="0">
<name>displayPaymentReturn</name>
<title>Payment return</title>
<description/>
<name>displayPaymentReturn</name><title>Payment return</title><description/>
</hook>
<hook id="actionUpdateQuantity" live_edit="0">
<name>actionUpdateQuantity</name>
<title>Quantity update</title>
<description>Quantity is updated only when the customer effectively &lt;b&gt;place&lt;/b&gt; his order.</description>
<name>actionUpdateQuantity</name><title>Quantity update</title><description>Quantity is updated only when a customer effectively places their order</description>
</hook>
<hook id="displayRightColumn" live_edit="1">
<name>displayRightColumn</name>
<title>Right column blocks</title>
<description/>
<name>displayRightColumn</name><title>Right column blocks</title><description>This hook displays new elements in the right-hand column</description>
</hook>
<hook id="displayLeftColumn" live_edit="1">
<name>displayLeftColumn</name>
<title>Left column blocks</title>
<description/>
<name>displayLeftColumn</name><title>Left column blocks</title><description>This hook displays new elements in the left-hand column</description>
</hook>
<hook id="displayHome" live_edit="1">
<name>displayHome</name>
<title>Homepage content</title>
<description/>
<name>displayHome</name><title>Homepage content</title><description>This hook displays new elements on the homepage</description>
</hook>
<hook id="displayHeader" live_edit="0">
<name>displayHeader</name>
<title>Header of pages</title>
<description>A hook which allow you to do things in the header of each pages</description>
<name>displayHeader</name><title>Pages header</title><description>This hook displays additional elements in the header of your pages</description>
</hook>
<hook id="actionCartSave" live_edit="0">
<name>actionCartSave</name>
<title>Cart creation and update</title>
<description/>
<name>actionCartSave</name><title>Cart creation and update</title><description>This hook is displayed when a product is added to the cart or if the cart's content is modified</description>
</hook>
<hook id="actionAuthentication" live_edit="0">
<name>actionAuthentication</name>
<title>Successful customer authentication</title>
<description/>
<name>actionAuthentication</name><title>Successful customer authentication</title><description>This hook is displayed after a customer successfully signs in</description>
</hook>
<hook id="actionProductAdd" live_edit="0">
<name>actionProductAdd</name>
<title>Product creation</title>
<description/>
<name>actionProductAdd</name><title>Product creation</title><description>This hook is displayed after a product is created</description>
</hook>
<hook id="actionProductUpdate" live_edit="0">
<name>actionProductUpdate</name>
<title>Product Update</title>
<description/>
<name>actionProductUpdate</name><title>Product update</title><description>This hook is displayed after a product has been updated</description>
</hook>
<hook id="displayTop" live_edit="0">
<name>displayTop</name>
<title>Top of pages</title>
<description>A hook which allow you to do things a the top of each pages.</description>
<name>displayTop</name><title>Top of pages</title><description>This hook displays additional elements at the top of your pages</description>
</hook>
<hook id="displayRightColumnProduct" live_edit="0">
<name>displayRightColumnProduct</name>
<title>Extra actions on the product page (right column).</title>
<description/>
<name>displayRightColumnProduct</name><title>New elements on the product page (right column)</title><description>This hook displays new elements in the right-hand column of the product page</description>
</hook>
<hook id="actionProductDelete" live_edit="0">
<name>actionProductDelete</name>
<title>Product deletion</title>
<description>This hook is called when a product is deleted</description>
<name>actionProductDelete</name><title>Product deletion</title><description>This hook is called when a product is deleted</description>
</hook>
<hook id="displayFooterProduct" live_edit="1">
<name>displayFooterProduct</name>
<title>Product footer</title>
<description>Add new blocks under the product description</description>
<name>displayFooterProduct</name><title>Product footer</title><description>This hook adds new blocks under the product's description</description>
</hook>
<hook id="displayInvoice" live_edit="0">
<name>displayInvoice</name>
<title>Invoice</title>
<description>Add blocks to invoice (order)</description>
<name>displayInvoice</name><title>Invoice</title><description>This hook displays new blocks on the invoice (order)</description>
</hook>
<hook id="actionOrderStatusUpdate" live_edit="0">
<name>actionOrderStatusUpdate</name>
<title>Order's status update event</title>
<description>Launch modules when the order's status of an order change.</description>
<name>actionOrderStatusUpdate</name><title>Order status update - Event</title><description>This hook launches modules when the status of an order changes.</description>
</hook>
<hook id="displayAdminOrder" live_edit="0">
<name>displayAdminOrder</name>
<title>Display in Back-Office, tab AdminOrder</title>
<description>Launch modules when the tab AdminOrder is displayed on back-office.</description>
<name>displayAdminOrder</name><title>Display new elements in the Back Office, tab AdminOrder</title><description>This hook launches modules when the AdminOrder" tab is displayed in the Back Office"</description>
</hook>
<hook id="displayFooter" live_edit="0">
<name>displayFooter</name>
<title>Footer</title>
<description>Add block in footer</description>
<name>displayFooter</name><title>Footer</title><description>This hook displays new blocks in the footer</description>
</hook>
<hook id="displayPDFInvoice" live_edit="0">
<name>displayPDFInvoice</name>
<title>PDF Invoice</title>
<description>Allow the display of extra informations into the PDF invoice</description>
<name>displayPDFInvoice</name><title>PDF Invoice</title><description>This hook allows you to display additional information on PDF invoices</description>
</hook>
<hook id="displayAdminCustomers" live_edit="0">
<name>displayAdminCustomers</name>
<title>Display in Back-Office, tab AdminCustomers</title>
<description>Launch modules when the tab AdminCustomers is displayed on back-office.</description>
<name>displayAdminCustomers</name><title>Display new elements in the Back Office, tab AdminCustomers</title><description>This hook launches modules when the AdminCustomers" tab is displayed in the Back Office"</description>
</hook>
<hook id="displayOrderConfirmation" live_edit="0">
<name>displayOrderConfirmation</name>
<title>Order confirmation page</title>
<description>Called on order confirmation page</description>
<name>displayOrderConfirmation</name><title>Order confirmation page</title><description>This hook is called within an order's confirmation page</description>
</hook>
<hook id="actionCustomerAccountAdd" live_edit="0">
<name>actionCustomerAccountAdd</name>
<title>Successful customer create account</title>
<description>Called when new customer create account successfuled</description>
<name>actionCustomerAccountAdd</name><title>Successful customer account creation</title><description>This hook is called when a new customer creates an account successfully</description>
</hook>
<hook id="displayCustomerAccount" live_edit="0">
<name>displayCustomerAccount</name>
<title>Customer account page display in front office</title>
<description>Display on page account of the customer</description>
<name>displayCustomerAccount</name><title>Customer account displayed in Front Office</title><description>This hook displays new elements on the customer account page</description>
</hook>
<hook id="actionOrderSlipAdd" live_edit="0">
<name>actionOrderSlipAdd</name>
<title>Called when a order slip is created</title>
<description>Called when a quantity of one product change in an order.</description>
<name>actionOrderSlipAdd</name><title>Order slip creation</title><description>This hook is called when a product's quantity is modified</description>
</hook>
<hook id="displayProductTab" live_edit="0">
<name>displayProductTab</name>
<title>Tabs on product page</title>
<description>Called on order product page tabs</description>
<name>displayProductTab</name><title>Tabs on product page</title><description>This hook is called on the product page's tab</description>
</hook>
<hook id="displayProductTabContent" live_edit="0">
<name>displayProductTabContent</name>
<title>Content of tabs on product page</title>
<description>Called on order product page tabs</description>
<name>displayProductTabContent</name><title>Tabs content on the product page</title><description>This hook is called on the product page's tab</description>
</hook>
<hook id="displayShoppingCartFooter" live_edit="0">
<name>displayShoppingCartFooter</name>
<title>Shopping cart footer</title>
<description>Display some specific informations on the shopping cart page</description>
<name>displayShoppingCartFooter</name><title>Shopping cart footer</title><description>This hook displays some specific information on the shopping cart's page</description>
</hook>
<hook id="displayCustomerAccountForm" live_edit="0">
<name>displayCustomerAccountForm</name>
<title>Customer account creation form</title>
<description>Display some information on the form to create a customer account</description>
<name>displayCustomerAccountForm</name><title>Customer account creation form</title><description>This hook displays some information on the form to create a customer account</description>
</hook>
<hook id="displayAdminStatsModules" live_edit="0">
<name>displayAdminStatsModules</name>
<title>Stats - Modules</title>
<description/>
<name>displayAdminStatsModules</name><title>Stats - Modules</title><description/>
</hook>
<hook id="displayAdminStatsGraphEngine" live_edit="0">
<name>displayAdminStatsGraphEngine</name>
<title>Graph Engines</title>
<description/>
<name>displayAdminStatsGraphEngine</name><title>Graph engines</title><description/>
</hook>
<hook id="actionOrderReturn" live_edit="0">
<name>actionOrderReturn</name>
<title>Product returned</title>
<description/>
<name>actionOrderReturn</name><title>Returned product</title><description>This hook is displayed when a customer returns a product </description>
</hook>
<hook id="displayProductButtons" live_edit="0">
<name>displayProductButtons</name>
<title>Product actions</title>
<description>Put new action buttons on product page</description>
<name>displayProductButtons</name><title>Product page actions</title><description>This hook adds new action buttons on the product page</description>
</hook>
<hook id="displayBackOfficeHome" live_edit="0">
<name>displayBackOfficeHome</name>
<title>Administration panel homepage</title>
<description/>
<name>displayBackOfficeHome</name><title>Administration panel homepage</title><description>This hook is displayed on the admin panel's homepage</description>
</hook>
<hook id="displayAdminStatsGridEngine" live_edit="0">
<name>displayAdminStatsGridEngine</name>
<title>Grid Engines</title>
<description/>
<name>displayAdminStatsGridEngine</name><title>Grid engines</title><description/>
</hook>
<hook id="actionWatermark" live_edit="0">
<name>actionWatermark</name>
<title>Watermark</title>
<description/>
<name>actionWatermark</name><title>Watermark</title><description/>
</hook>
<hook id="actionProductCancel" live_edit="0">
<name>actionProductCancel</name>
<title>Product cancelled</title>
<description>This hook is called when you cancel a product in an order</description>
<name>actionProductCancel</name><title>Product cancelled</title><description>This hook is called when you cancel a product in an order</description>
</hook>
<hook id="displayLeftColumnProduct" live_edit="0">
<name>displayLeftColumnProduct</name>
<title>Extra actions on the product page (left column).</title>
<description/>
<name>displayLeftColumnProduct</name><title>New elements on the product page (left column)</title><description>This hook displays new elements in the left-hand column of the product page</description>
</hook>
<hook id="actionProductOutOfStock" live_edit="0">
<name>actionProductOutOfStock</name>
<title>Product out of stock</title>
<description>Make action while product is out of stock</description>
<name>actionProductOutOfStock</name><title>Out-of-stock product</title><description>This hook displays new action buttons if a product is out of stock</description>
</hook>
<hook id="actionProductAttributeUpdate" live_edit="0">
<name>actionProductAttributeUpdate</name>
<title>Product attribute update</title>
<description/>
<name>actionProductAttributeUpdate</name><title>Product attribute update</title><description>This hook is displayed when a product's attribute is updated</description>
</hook>
<hook id="displayCarrierList" live_edit="0">
<name>displayCarrierList</name>
<title>Extra carrier (module mode)</title>
<description/>
<name>displayCarrierList</name><title>Extra carrier (module mode)</title><description/>
</hook>
<hook id="displayShoppingCart" live_edit="0">
<name>displayShoppingCart</name>
<title>Shopping cart extra button</title>
<description>Display some specific informations</description>
<name>displayShoppingCart</name><title>Shopping cart - Additional button</title><description>This hook displays new action buttons within the shopping cart</description>
</hook>
<hook id="actionSearch" live_edit="0">
<name>actionSearch</name>
<title>Search</title>
<description/>
<name>actionSearch</name><title>Search</title><description/>
</hook>
<hook id="displayBeforePayment" live_edit="0">
<name>displayBeforePayment</name>
<title>Redirect in order process</title>
<description>Redirect user to the module instead of displaying payment modules</description>
<name>displayBeforePayment</name><title>Redirect during the order process</title><description>This hook redirects the user to the module instead of displaying payment modules</description>
</hook>
<hook id="actionCarrierUpdate" live_edit="0">
<name>actionCarrierUpdate</name>
<title>Carrier Update</title>
<description>This hook is called when a carrier is updated</description>
<name>actionCarrierUpdate</name><title>Carrier Update</title><description>This hook is called when a carrier is updated</description>
</hook>
<hook id="actionOrderStatusPostUpdate" live_edit="0">
<name>actionOrderStatusPostUpdate</name>
<title>Post update of order status</title>
<description/>
<name>actionOrderStatusPostUpdate</name><title>Post update of order status</title><description/>
</hook>
<hook id="displayCustomerAccountFormTop" live_edit="0">
<name>displayCustomerAccountFormTop</name>
<title>Block above the form for create an account</title>
<description/>
<name>displayCustomerAccountFormTop</name><title>Block above the form for create an account</title><description>This hook is displayed above the customer's account creation form</description>
</hook>
<hook id="displayBackOfficeHeader" live_edit="0">
<name>displayBackOfficeHeader</name>
<title>Administration panel header</title>
<description/>
<name>displayBackOfficeHeader</name><title>Administration panel header</title><description>This hook is displayed in the header of the admin panel</description>
</hook>
<hook id="displayBackOfficeTop" live_edit="0">
<name>displayBackOfficeTop</name>
<title>Administration panel hover the tabs</title>
<description/>
<name>displayBackOfficeTop</name><title>Administration panel hover the tabs</title><description>This hook is displayed on the roll hover of the tabs within the admin panel</description>
</hook>
<hook id="displayBackOfficeFooter" live_edit="0">
<name>displayBackOfficeFooter</name>
<title>Administration panel footer</title>
<description/>
<name>displayBackOfficeFooter</name><title>Administration panel footer</title><description>This hook is displayed within the admin panel's footer</description>
</hook>
<hook id="actionProductAttributeDelete" live_edit="0">
<name>actionProductAttributeDelete</name>
<title>Product Attribute Deletion</title>
<description/>
<name>actionProductAttributeDelete</name><title>Product attribute deletion</title><description>This hook is displayed when a product's attribute is deleted</description>
</hook>
<hook id="actionCarrierProcess" live_edit="0">
<name>actionCarrierProcess</name>
<title>Carrier Process</title>
<description/>
<name>actionCarrierProcess</name><title>Carrier process</title><description/>
</hook>
<hook id="actionOrderDetail" live_edit="0">
<name>actionOrderDetail</name>
<title>Order Detail</title>
<description>To set the follow-up in smarty when order detail is called</description>
<name>actionOrderDetail</name><title>Order detail</title><description>This hook is used to set the follow-up in Smarty when an order's detail is called</description>
</hook>
<hook id="displayBeforeCarrier" live_edit="0">
<name>displayBeforeCarrier</name>
<title>Before carrier list</title>
<description>This hook is display before the carrier list on Front office</description>
<name>displayBeforeCarrier</name><title>Before carriers list</title><description>This hook is displayed before the carrier list in Front Office</description>
</hook>
<hook id="displayOrderDetail" live_edit="0">
<name>displayOrderDetail</name>
<title>Order detail displayed</title>
<description>Displayed on order detail on front office</description>
<name>displayOrderDetail</name><title>Order detail</title><description>This hook is displayed within the order's details in Front Office</description>
</hook>
<hook id="actionPaymentCCAdd" live_edit="0">
<name>actionPaymentCCAdd</name>
<title>Payment CC added</title>
<description>Payment CC added</description>
<name>actionPaymentCCAdd</name><title>Payment CC added</title><description/>
</hook>
<hook id="displayProductComparison" live_edit="0">
<name>displayProductComparison</name>
<title>Extra Product Comparison</title>
<description>Extra Product Comparison</description>
<name>displayProductComparison</name><title>Extra product comparison</title><description/>
</hook>
<hook id="actionCategoryAdd" live_edit="0">
<name>actionCategoryAdd</name>
<title>Category creation</title>
<description/>
<name>actionCategoryAdd</name><title>Category creation</title><description>This hook is displayed when a category is created</description>
</hook>
<hook id="actionCategoryUpdate" live_edit="0">
<name>actionCategoryUpdate</name>
<title>Category modification</title>
<description/>
<name>actionCategoryUpdate</name><title>Category modification</title><description>This hook is displayed when a category is modified</description>
</hook>
<hook id="actionCategoryDelete" live_edit="0">
<name>actionCategoryDelete</name>
<title>Category removal</title>
<description/>
<name>actionCategoryDelete</name><title>Category deletion</title><description>This hook is displayed when a category is deleted</description>
</hook>
<hook id="actionBeforeAuthentication" live_edit="0">
<name>actionBeforeAuthentication</name>
<title>Before Authentication</title>
<description>Before authentication</description>
<name>actionBeforeAuthentication</name><title>Before authentication</title><description>This hook is displayed before the customer's authentication</description>
</hook>
<hook id="displayPaymentTop" live_edit="0">
<name>displayPaymentTop</name>
<title>Top of payment page</title>
<description>Top of payment page</description>
<name>displayPaymentTop</name><title>Top of payment page</title><description>This hook is displayed at the top of the payment page</description>
</hook>
<hook id="actionHtaccessCreate" live_edit="0">
<name>actionHtaccessCreate</name>
<title>After htaccess creation</title>
<description>After htaccess creation</description>
<name>actionHtaccessCreate</name><title>After htaccess creation</title><description>This hook is displayed after the htaccess creation</description>
</hook>
<hook id="actionAdminMetaSave" live_edit="0">
<name>actionAdminMetaSave</name>
<title>After save configuration in AdminMeta</title>
<description>After save configuration in AdminMeta</description>
<name>actionAdminMetaSave</name><title>After saving the configuration in AdminMeta</title><description>This hook is displayed after saving the configuration in AdminMeta</description>
</hook>
<hook id="displayAttributeGroupForm" live_edit="0">
<name>displayAttributeGroupForm</name>
<title>Add fields to the form "attribute group"</title>
<description>Add fields to the form "attribute group"</description>
<name>displayAttributeGroupForm</name><title>Add fields to the form 'attribute group'</title><description>This hook adds fields to the form 'attribute group'</description>
</hook>
<hook id="actionAttributeGroupSave" live_edit="0">
<name>actionAttributeGroupSave</name>
<title>On saving attribute group</title>
<description>On saving attribute group</description>
<name>actionAttributeGroupSave</name><title>Saving an attribute group</title><description>This hook is called while saving an attributes group</description>
</hook>
<hook id="actionAttributeGroupDelete" live_edit="0">
<name>actionAttributeGroupDelete</name>
<title>On deleting attribute group</title>
<description>On deleting attribute group</description>
<name>actionAttributeGroupDelete</name><title>Deleting attribute group</title><description>This hook is called while deleting an attributes group</description>
</hook>
<hook id="displayFeatureForm" live_edit="0">
<name>displayFeatureForm</name>
<title>Add fields to the form "feature"</title>
<description>Add fields to the form "feature"</description>
<name>displayFeatureForm</name><title>Add fields to the form 'feature'</title><description>This hook adds fields to the form 'feature'</description>
</hook>
<hook id="actionFeatureSave" live_edit="0">
<name>actionFeatureSave</name>
<title>On saving attribute feature</title>
<description>On saving attribute feature</description>
<name>actionFeatureSave</name><title>Saving attributes' features</title><description>This hook is called while saving an attributes features</description>
</hook>
<hook id="actionFeatureDelete" live_edit="0">
<name>actionFeatureDelete</name>
<title>On deleting attribute feature</title>
<description>On deleting attribute feature</description>
<name>actionFeatureDelete</name><title>Deleting attributes' features</title><description>This hook is called while deleting an attributes features</description>
</hook>
<hook id="actionProductSave" live_edit="0">
<name>actionProductSave</name>
<title>On saving products</title>
<description>On saving products</description>
<name>actionProductSave</name><title>Saving products</title><description>This hook is called while saving products</description>
</hook>
<hook id="actionProductListOverride" live_edit="0">
<name>actionProductListOverride</name>
<title>Assign product list to a category</title>
<description>Assign product list to a category</description>
<name>actionProductListOverride</name><title>Assign a products list to a category</title><description>This hook assigns a products list to a category</description>
</hook>
<hook id="displayAttributeGroupPostProcess" live_edit="0">
<name>displayAttributeGroupPostProcess</name>
<title>On post-process in admin attribute group</title>
<description>On post-process in admin attribute group</description>
<name>displayAttributeGroupPostProcess</name><title>On post-process in admin attribute group</title><description>This hook is called on post-process in admin attribute group</description>
</hook>
<hook id="displayFeaturePostProcess" live_edit="0">
<name>displayFeaturePostProcess</name>
<title>On post-process in admin feature</title>
<description>On post-process in admin feature</description>
<name>displayFeaturePostProcess</name><title>On post-process in admin feature</title><description>This hook is called on post-process in admin feature</description>
</hook>
<hook id="displayFeatureValueForm" live_edit="0">
<name>displayFeatureValueForm</name>
<title>Add fields to the form "feature value"</title>
<description>Add fields to the form "feature value"</description>
<name>displayFeatureValueForm</name><title>Add fields to the form 'feature value'</title><description>This hook adds fields to the form 'feature value'</description>
</hook>
<hook id="displayFeatureValuePostProcess" live_edit="0">
<name>displayFeatureValuePostProcess</name>
<title>On post-process in admin feature value</title>
<description>On post-process in admin feature value</description>
<name>displayFeatureValuePostProcess</name><title>On post-process in admin feature value</title><description>This hook is called on post-process in admin feature value</description>
</hook>
<hook id="actionFeatureValueDelete" live_edit="0">
<name>actionFeatureValueDelete</name>
<title>On deleting attribute feature value</title>
<description>On deleting attribute feature value</description>
<name>actionFeatureValueDelete</name><title>Deleting attributes' features' values</title><description>This hook is called while deleting an attributes features value</description>
</hook>
<hook id="actionFeatureValueSave" live_edit="0">
<name>actionFeatureValueSave</name>
<title>On saving attribute feature value</title>
<description>On saving attribute feature value</description>
<name>actionFeatureValueSave</name><title>Saving an attributes features value</title><description>This hook is called while saving an attributes features value</description>
</hook>
<hook id="displayAttributeForm" live_edit="0">
<name>displayAttributeForm</name>
<title>Add fields to the form "attribute value"</title>
<description>Add fields to the form "attribute value"</description>
<name>displayAttributeForm</name><title>Add fields to the form 'attribute value'</title><description>This hook adds fields to the form 'attribute value'</description>
</hook>
<hook id="actionAttributePostProcess" live_edit="0">
<name>actionAttributePostProcess</name>
<title>On post-process in admin feature value</title>
<description>On post-process in admin feature value</description>
<name>actionAttributePostProcess</name><title>On post-process in admin feature value</title><description>This hook is called on post-process in admin feature value</description>
</hook>
<hook id="actionAttributeDelete" live_edit="0">
<name>actionAttributeDelete</name>
<title>On deleting attribute feature value</title>
<description>On deleting attribute feature value</description>
<name>actionAttributeDelete</name><title>Deleting an attributes features value</title><description>This hook is called while deleting an attributes features value</description>
</hook>
<hook id="actionAttributeSave" live_edit="0">
<name>actionAttributeSave</name>
<title>On saving attribute feature value</title>
<description>On saving attribute feature value</description>
<name>actionAttributeSave</name><title>Saving an attributes features value</title><description>This hook is called while saving an attributes features value</description>
</hook>
<hook id="actionTaxManager" live_edit="0">
<name>actionTaxManager</name>
<title>Tax Manager Factory</title>
<description/>
<name>actionTaxManager</name><title>Tax Manager Factory</title><description/>
</hook>
<hook id="displayMyAccountBlock" live_edit="0">
<name>displayMyAccountBlock</name>
<title>My account block</title>
<description>Display extra informations inside the "my account" block</description>
<name>displayMyAccountBlock</name><title>My account block</title><description>This hook displays extra information within the 'my account' block"</description>
</hook>
</entities>
</entity_hook>
+7 -7
View File
@@ -43,31 +43,31 @@
<field name="advanced_stock_management"/>
</fields>
<entities>
<product id="iPod_Nano" id_supplier="AppleStore" id_manufacturer="Apple_Computer_Inc" id_category_default="iPods" on_sale="0" online_only="0" ean13="0" upc="" ecotax="0.000000" quantity="0" minimal_quantity="1" price="124.581940" wholesale_price="70.000000" unit_price_ratio="0.000000" additional_shipping_cost="0.00" reference="" supplier_reference="" width="0" height="0" depth="0" weight="0.5" out_of_stock="2" quantity_discount="0" customizable="0" uploadable_files="0" text_fields="0" active="1" redirect_type="" id_product_redirected="0" available_for_order="1" available_date="0000-00-00" condition="new" show_price="1" indexed="0" cache_is_pack="0" cache_has_attachments="0" is_virtual="0" cache_default_attribute="0" advanced_stock_management="0">
<product id="iPod_Nano" id_supplier="AppleStore" id_manufacturer="Apple_Computer_Inc" id_category_default="iPods" on_sale="0" online_only="0" ean13="0" upc="" ecotax="0.000000" quantity="0" minimal_quantity="1" price="124.581940" wholesale_price="70.000000" unit_price_ratio="0.000000" additional_shipping_cost="0.00" reference="demo_1" supplier_reference="" width="0" height="0" depth="0" weight="0.5" out_of_stock="2" quantity_discount="0" customizable="0" uploadable_files="0" text_fields="0" active="1" redirect_type="" id_product_redirected="0" available_for_order="1" available_date="0000-00-00" condition="new" show_price="1" indexed="0" cache_is_pack="0" cache_has_attachments="0" is_virtual="0" cache_default_attribute="0" advanced_stock_management="0">
<unity/>
<location/>
</product>
<product id="iPod_shuffle" id_supplier="AppleStore" id_manufacturer="Apple_Computer_Inc" id_category_default="iPods" on_sale="0" online_only="0" ean13="0" upc="" ecotax="0.000000" quantity="0" minimal_quantity="1" price="66.053500" wholesale_price="33.000000" unit_price_ratio="0.000000" additional_shipping_cost="0.00" reference="" supplier_reference="" width="0" height="0" depth="0" weight="0" out_of_stock="2" quantity_discount="0" customizable="0" uploadable_files="0" text_fields="0" active="1" redirect_type="" id_product_redirected="0" available_for_order="1" available_date="0000-00-00" condition="new" show_price="1" indexed="0" cache_is_pack="0" cache_has_attachments="0" is_virtual="0" cache_default_attribute="0" advanced_stock_management="0">
<product id="iPod_shuffle" id_supplier="AppleStore" id_manufacturer="Apple_Computer_Inc" id_category_default="iPods" on_sale="0" online_only="0" ean13="0" upc="" ecotax="0.000000" quantity="0" minimal_quantity="1" price="66.053500" wholesale_price="33.000000" unit_price_ratio="0.000000" additional_shipping_cost="0.00" reference="demo_2" supplier_reference="" width="0" height="0" depth="0" weight="0" out_of_stock="2" quantity_discount="0" customizable="0" uploadable_files="0" text_fields="0" active="1" redirect_type="" id_product_redirected="0" available_for_order="1" available_date="0000-00-00" condition="new" show_price="1" indexed="0" cache_is_pack="0" cache_has_attachments="0" is_virtual="0" cache_default_attribute="0" advanced_stock_management="0">
<unity/>
<location/>
</product>
<product id="MacBook_Air" id_supplier="AppleStore" id_manufacturer="Apple_Computer_Inc" id_category_default="Laptops" on_sale="0" online_only="0" ean13="0" upc="" ecotax="0.000000" quantity="0" minimal_quantity="1" price="1504.180602" wholesale_price="1000.000000" unit_price_ratio="0.000000" additional_shipping_cost="0.00" reference="" supplier_reference="" width="0" height="0" depth="0" weight="1.36" out_of_stock="2" quantity_discount="0" customizable="0" uploadable_files="0" text_fields="0" active="1" redirect_type="" id_product_redirected="0" available_for_order="1" available_date="0000-00-00" condition="new" show_price="1" indexed="0" cache_is_pack="0" cache_has_attachments="0" is_virtual="0" cache_default_attribute="0" advanced_stock_management="0">
<product id="MacBook_Air" id_supplier="AppleStore" id_manufacturer="Apple_Computer_Inc" id_category_default="Laptops" on_sale="0" online_only="0" ean13="0" upc="" ecotax="0.000000" quantity="0" minimal_quantity="1" price="1504.180602" wholesale_price="1000.000000" unit_price_ratio="0.000000" additional_shipping_cost="0.00" reference="demo_3" supplier_reference="" width="0" height="0" depth="0" weight="1.36" out_of_stock="2" quantity_discount="0" customizable="0" uploadable_files="0" text_fields="0" active="1" redirect_type="" id_product_redirected="0" available_for_order="1" available_date="0000-00-00" condition="new" show_price="1" indexed="0" cache_is_pack="0" cache_has_attachments="0" is_virtual="0" cache_default_attribute="0" advanced_stock_management="0">
<unity/>
<location/>
</product>
<product id="MacBook" id_supplier="AppleStore" id_manufacturer="Apple_Computer_Inc" id_category_default="Laptops" on_sale="0" online_only="0" ean13="0" upc="" ecotax="0.000000" quantity="0" minimal_quantity="1" price="1170.568561" wholesale_price="0.000000" unit_price_ratio="0.000000" additional_shipping_cost="0.00" reference="" supplier_reference="" width="0" height="0" depth="0" weight="0.75" out_of_stock="2" quantity_discount="0" customizable="0" uploadable_files="0" text_fields="0" active="1" redirect_type="" id_product_redirected="0" available_for_order="1" available_date="0000-00-00" condition="new" show_price="1" indexed="0" cache_is_pack="0" cache_has_attachments="0" is_virtual="0" cache_default_attribute="0" advanced_stock_management="0">
<product id="MacBook" id_supplier="AppleStore" id_manufacturer="Apple_Computer_Inc" id_category_default="Laptops" on_sale="0" online_only="0" ean13="0" upc="" ecotax="0.000000" quantity="0" minimal_quantity="1" price="1170.568561" wholesale_price="0.000000" unit_price_ratio="0.000000" additional_shipping_cost="0.00" reference="demo_4" supplier_reference="" width="0" height="0" depth="0" weight="0.75" out_of_stock="2" quantity_discount="0" customizable="0" uploadable_files="0" text_fields="0" active="1" redirect_type="" id_product_redirected="0" available_for_order="1" available_date="0000-00-00" condition="new" show_price="1" indexed="0" cache_is_pack="0" cache_has_attachments="0" is_virtual="0" cache_default_attribute="0" advanced_stock_management="0">
<unity/>
<location/>
</product>
<product id="iPod_touch" id_supplier="" id_manufacturer="" id_category_default="iPods" on_sale="0" online_only="0" ean13="0" upc="" ecotax="0.000000" quantity="0" minimal_quantity="1" price="241.638796" wholesale_price="200.000000" unit_price_ratio="0.000000" additional_shipping_cost="0.00" reference="" supplier_reference="" width="0" height="0" depth="0" weight="0" out_of_stock="2" quantity_discount="0" customizable="0" uploadable_files="0" text_fields="0" active="1" redirect_type="" id_product_redirected="0" available_for_order="1" available_date="0000-00-00" condition="new" show_price="1" indexed="0" cache_is_pack="0" cache_has_attachments="0" is_virtual="0" cache_default_attribute="0" advanced_stock_management="0">
<product id="iPod_touch" id_supplier="" id_manufacturer="" id_category_default="iPods" on_sale="0" online_only="0" ean13="0" upc="" ecotax="0.000000" quantity="0" minimal_quantity="1" price="241.638796" wholesale_price="200.000000" unit_price_ratio="0.000000" additional_shipping_cost="0.00" reference="demo_5" supplier_reference="" width="0" height="0" depth="0" weight="0" out_of_stock="2" quantity_discount="0" customizable="0" uploadable_files="0" text_fields="0" active="1" redirect_type="" id_product_redirected="0" available_for_order="1" available_date="0000-00-00" condition="new" show_price="1" indexed="0" cache_is_pack="0" cache_has_attachments="0" is_virtual="0" cache_default_attribute="0" advanced_stock_management="0">
<unity/>
<location/>
</product>
<product id="Belkin_Leather_Folio_for_iPod_nano_-_Black_Chocolate" id_supplier="" id_manufacturer="" id_category_default="Accessories" on_sale="0" online_only="1" ean13="0" upc="" ecotax="0.000000" quantity="0" minimal_quantity="1" price="25.041806" wholesale_price="0.000000" unit_price_ratio="0.000000" additional_shipping_cost="0.00" reference="" supplier_reference="" width="0" height="0" depth="0" weight="0" out_of_stock="2" quantity_discount="0" customizable="0" uploadable_files="0" text_fields="0" active="1" redirect_type="" id_product_redirected="0" available_for_order="1" available_date="0000-00-00" condition="new" show_price="1" indexed="0" cache_is_pack="0" cache_has_attachments="0" is_virtual="0" cache_default_attribute="0" advanced_stock_management="0">
<product id="Belkin_Leather_Folio_for_iPod_nano_-_Black_Chocolate" id_supplier="" id_manufacturer="" id_category_default="Accessories" on_sale="0" online_only="1" ean13="0" upc="" ecotax="0.000000" quantity="0" minimal_quantity="1" price="25.041806" wholesale_price="0.000000" unit_price_ratio="0.000000" additional_shipping_cost="0.00" reference="demo_6" supplier_reference="" width="0" height="0" depth="0" weight="0" out_of_stock="2" quantity_discount="0" customizable="0" uploadable_files="0" text_fields="0" active="1" redirect_type="" id_product_redirected="0" available_for_order="1" available_date="0000-00-00" condition="new" show_price="1" indexed="0" cache_is_pack="0" cache_has_attachments="0" is_virtual="0" cache_default_attribute="0" advanced_stock_management="0">
<unity/>
<location/>
</product>
<product id="Shure_SE210_Sound-Isolating_Earphones_for_iPod_and_iPhone" id_supplier="Shure_Online_Store" id_manufacturer="Shure_Incorporated" id_category_default="Accessories" on_sale="0" online_only="1" ean13="0" upc="" ecotax="0.000000" quantity="0" minimal_quantity="1" price="124.581940" wholesale_price="0.000000" unit_price_ratio="0.000000" additional_shipping_cost="0.00" reference="" supplier_reference="" width="0" height="0" depth="0" weight="0" out_of_stock="2" quantity_discount="0" customizable="0" uploadable_files="0" text_fields="0" active="1" redirect_type="" id_product_redirected="0" available_for_order="1" available_date="0000-00-00" condition="new" show_price="1" indexed="0" cache_is_pack="0" cache_has_attachments="0" is_virtual="0" cache_default_attribute="0" advanced_stock_management="0">
<product id="Shure_SE210_Sound-Isolating_Earphones_for_iPod_and_iPhone" id_supplier="Shure_Online_Store" id_manufacturer="Shure_Incorporated" id_category_default="Accessories" on_sale="0" online_only="1" ean13="0" upc="" ecotax="0.000000" quantity="0" minimal_quantity="1" price="124.581940" wholesale_price="0.000000" unit_price_ratio="0.000000" additional_shipping_cost="0.00" reference="demo_7" supplier_reference="" width="0" height="0" depth="0" weight="0" out_of_stock="2" quantity_discount="0" customizable="0" uploadable_files="0" text_fields="0" active="1" redirect_type="" id_product_redirected="0" available_for_order="1" available_date="0000-00-00" condition="new" show_price="1" indexed="0" cache_is_pack="0" cache_has_attachments="0" is_virtual="0" cache_default_attribute="0" advanced_stock_management="0">
<unity/>
<location/>
</product>
+3
View File
@@ -67,6 +67,9 @@ require_once(_PS_INSTALL_PATH_.'classes/simplexml.php');
if (!@ini_get('date.timezone'))
@date_default_timezone_set('UTC');
// Some hosting still have magic_quotes_runtime configured
ini_set('magic_quotes_runtime', 0);
// Try to improve memory limit if it's under 32M
if (psinstall_get_memory_limit() < psinstall_get_octets('32M'))
ini_set('memory_limit', '32M');
+3 -3
View File
@@ -127,7 +127,7 @@ return array(
'Official forum' => 'Fórum oficial',
'Support' => 'Suporte',
'Documentation' => 'Documentação',
'Contact us!' => 'Entre em Contato !',
'Contact us' => 'Entre em Contato',
'Forum' => 'Fórum',
'Blog' => 'Blog',
'Done!' => 'Feito !',
@@ -153,8 +153,8 @@ return array(
'If you need help, do not hesitate to check <a href="%1$s" target="_blank">our documentation</a> or to contact our support team: %2$s' => 'Se você precisar de ajuda, não deixe de visitar <a href="%1$s" target="_blank">nossa documentação</a> ou contatar nossa equipe de suporte : %2$s',
'Choose the installer language:' => 'Escolha a língua para instalação :',
'Did you know?' => 'Você sabia ?',
'PrestaShop and its community offers over 40 different languages for free, directly accessible from your Back Office on the Localization tab.' => 'PrestaShop e sua comunidade oferece mais de 40 diferentes idiomas de graça, acessível diretamente a partir da sua Área Administrativa na aba localização.',
'Licenses Agreement' => 'Acordo de licenças',
'PrestaShop and its community offers over %d different languages for free, directly accessible from your Back Office on the Localization tab.' => 'PrestaShop e sua comunidade oferece mais de %d diferentes idiomas de graça, acessível diretamente a partir da sua Área Administrativa na aba localização.',
'License Agreements' => 'Acordo de licença',
'PrestaShop core is released under the OSL 3.0 while PrestaShop modules and themes are released under the AFL 3.0.' => 'O núcleo PrestaShop é publicado sob a OSL 3.0 enquanto os módulos e temas são publicados sob a AFL 3.0.',
'I agree to the above terms and conditions.' => 'Eu concordo com os termos e condições acima.',
'I agree to participate in improving the solution by sending anonymous information about my configuration.' => 'Eu concordo em participar na melhoria da solução enviando informações anônimas sobre a minha configuração.',
+3 -3
View File
@@ -121,7 +121,7 @@
'Official forum' => 'Offizielles Forum',
'Support' => 'Support',
'Documentation' => 'Tutotrials',
'Contact us!' => 'Kontaktieren Sie uns! Persönlicher Support',
'Contact us' => 'Kontaktieren Sie uns',
'Forum' => 'Forum',
'Blog' => 'Blog',
'Done!' => 'Erfolgreich abgeschlossen',
@@ -146,8 +146,8 @@
'The installation process should take only few minutes!' => 'Der Installationsprozess dauert nur ein paar Minuten!',
'If you need help, do not hesitate to check <a href="%1$s" target="_blank">our documentation</a> or to contact our support team: %2$s' => 'Falls Sie Hilfe benötigen, haben Sie folgende Möglichkeiten: <a href="%1$s" target="_blank">unsere Dokumentation einsehen</a>oder unser Support-Team zu kontaktieren: %2$s',
'Did you know?' => 'Wussten Sie schon?',
'PrestaShop and its community offers over 40 different languages for free, directly accessible from your Back Office on the Localization tab.' => 'PrestaShop und Community bietet Ihnen den kostenlosen Zugang zu über 40 verschiedenen Sprachen direkt aus Ihrem Back-office im Tabreiter "Tools"',
'Licenses Agreement' => 'Lizenzvertrag',
'PrestaShop and its community offers over %d different languages for free, directly accessible from your Back Office on the Localization tab.' => 'PrestaShop und Community bietet Ihnen den kostenlosen Zugang zu über %d verschiedenen Sprachen direkt aus Ihrem Back-office im Tabreiter "Tools"',
'License Agreements' => 'Lizenzvertrag',
'PrestaShop core is released under the OSL 3.0 while PrestaShop modules and themes are released under the AFL 3.0.' => 'PrestaShop core is unter der Lizenz OSL 3.0 herausgegeben. PrestaShop modules und Themes werden unter der Lizenz AFL 3.0. herausgegeben',
'I agree to the above terms and conditions.' => 'Ich stimme den oben genannten Vertragsbedingungen zu.',
'I agree to participate in improving the solution by sending anonymous information about my configuration.' => 'Ich möchte Prestashop in der verbesserung von Fehlern helfen, und stimme zu, dass bei groben Fehlern meine Konfigurationsdaten an Prestashop gesandt werden',
+3 -3
View File
@@ -121,7 +121,7 @@
'Official forum' => NULL,
'Support' => NULL,
'Documentation' => NULL,
'Contact us!' => '¡Contacte con nosotros!',
'Contact us' => 'Contacte con nosotros',
'Forum' => NULL,
'Blog' => 'El blog',
'Done!' => NULL,
@@ -146,8 +146,8 @@
'The installation process should take only few minutes!' => 'El proceso de instalación tardará solo unos minutos.',
'If you need help, do not hesitate to check <a href="%1$s" target="_blank">our documentation</a> or to contact our support team: %2$s' => NULL,
'Did you know?' => '¿Sabía que?',
'PrestaShop and its community offers over 40 different languages for free, directly accessible from your Back Office on the Localization tab.' => NULL,
'Licenses Agreement' => 'Contrato de Licencia',
'PrestaShop and its community offers over %d different languages for free, directly accessible from your Back Office on the Localization tab.' => NULL,
'License Agreements' => 'Contrato de Licencia',
'PrestaShop core is released under the OSL 3.0 while PrestaShop modules and themes are released under the AFL 3.0.' => NULL,
'I agree to the above terms and conditions.' => 'Estoy de acuerdo con los términos y condiciones.',
'I agree to participate in improving the solution by sending anonymous information about my configuration.' => NULL,
+3 -3
View File
@@ -127,7 +127,7 @@ return array(
'Official forum' => 'Forum officiel',
'Support' => 'Support',
'Documentation' => 'Documentation',
'Contact us!' => 'Nous contacter !',
'Contact us' => 'Nous contacter',
'Forum' => 'Forum',
'Blog' => 'Blog',
'Done!' => 'Fin !',
@@ -153,8 +153,8 @@ return array(
'If you need help, do not hesitate to check <a href="%1$s" target="_blank">our documentation</a> or to contact our support team: %2$s' => 'Si vous avez besoin d\'aide, n\'hésitez pas à visiter <a href="%1$s" target="_blank">notre documentation</a> ou à contacter notre équipe de support : %2$s',
'Choose the installer language:' => 'Choisissez la langue pour l\'installation :',
'Did you know?' => 'Le saviez vous ?',
'PrestaShop and its community offers over 40 different languages for free, directly accessible from your Back Office on the Localization tab.' => 'PrestaShop et sa communauté vous proposent plus de 40 langues gratuites directement accessibles depuis votre administration',
'Licenses Agreement' => 'Contrat de licences',
'PrestaShop and its community offers over %d different languages for free, directly accessible from your Back Office on the Localization tab.' => 'PrestaShop et sa communauté vous proposent gratuitement des traductions dans %d langues directement accessibles depuis votre administration.',
'License Agreements' => 'Contrats de licence',
'PrestaShop core is released under the OSL 3.0 while PrestaShop modules and themes are released under the AFL 3.0.' => 'Le cœur de PrestaShop est publié sous licence OSL 3.0 tandis que les modules et thèmes sont publiés sous licence AFL 3.0.',
'I agree to the above terms and conditions.' => 'J\'approuve les termes et conditions du contrat ci-dessus.',
'I agree to participate in improving the solution by sending anonymous information about my configuration.' => 'J\'accepte de participer à l\'amélioration de la solution en envoyant des informations anonymes sur ma configuration',
+3 -3
View File
@@ -121,7 +121,7 @@
'Official forum' => 'Forum ufficiale',
'Support' => 'Supporto',
'Documentation' => 'Documentazione',
'Contact us!' => 'Contattaci!',
'Contact us' => 'Contattaci',
'Forum' => 'Forum',
'Blog' => 'Il blog',
'Done!' => 'Fatto!',
@@ -146,8 +146,8 @@
'The installation process should take only few minutes!' => 'Il processo di installazione dovrebbe durare solo pochi minuti!',
'If you need help, do not hesitate to check <a href="%1$s" target="_blank">our documentation</a> or to contact our support team: %2$s' => 'Se hai bisogno di aiuto non asitare a guardare <a href="%1$s" target="_blank">our documentation</a> o contattare il nostro supporto: %2$s',
'Did you know?' => 'Lo sapevi?',
'PrestaShop and its community offers over 40 different languages for free, directly accessible from your Back Office on the Localization tab.' => 'PrestaShop e la sua comunità offre 40 diverse lingue gratuite, direttamente accessibile nel tuo back office nel tab Traduzioni',
'Licenses Agreement' => 'Contratto di Licenza',
'PrestaShop and its community offers over %d different languages for free, directly accessible from your Back Office on the Localization tab.' => 'PrestaShop e la sua comunità offre %d diverse lingue gratuite, direttamente accessibile nel tuo back office nel tab Traduzioni',
'License Agreements' => 'Contratto di Licenza',
'PrestaShop core is released under the OSL 3.0 while PrestaShop modules and themes are released under the AFL 3.0.' => 'Il core di PrestaShop è rilasicata sollo licenza OSL 3.0 mentre i moduli e i temi prestashop sono rilasciati sotto licenza AFL 3.0',
'I agree to the above terms and conditions.' => 'Accetto i termini e le condizioni del contratto seguente.',
'I agree to participate in improving the solution by sending anonymous information about my configuration.' => 'Accetto di partecipare nell\'implementare la soluzione inviando informazioni anonime sulla mia configurazione',
+6
View File
@@ -71,6 +71,12 @@ class InstallModelDatabase extends InstallAbstractModel
// Check if a table with same prefix already exists
if (!$clear && Db::hasTableWithSamePrefix($server, $login, $password, $database, $prefix))
$errors[] = $this->language->l('At least one table with same prefix was already found, please change your prefix or drop your database');
if (($create_error = Db::checkCreatePrivilege($server, $login, $password, $database, $prefix, $engine)) !== true)
{
$errors[] = $this->language->l(sprintf('Your database login don\'t have the privileges to create table on the database "%s". Ask your hosting provider:', $database));
if ($create_error != false)
$errors[] = $create_error;
}
break;
case 1:
+5
View File
@@ -22,4 +22,9 @@ $(document).ready(function()
else
$('#btNext').addClass('disabled').attr('disabled', true);
});
if ($('#set_license').prop('checked'))
$('#btNext').removeClass('disabled').attr('disabled', false);
else
$('#btNext').addClass('disabled').attr('disabled', true);
});
+1 -1
View File
@@ -25,7 +25,7 @@
<li><a href="http://www.prestashop.com" title="PrestaShop.com" target="_blank">PrestaShop.com</a> | </li>
<li><a href="<?php echo $this->getSupportLink() ?>" title="<?php echo $this->l('Support'); ?>" target="_blank"><?php echo $this->l('Support'); ?></a> | </li>
<li><a href="<?php echo $this->getDocumentationLink() ?>" title="<?php echo $this->l('Documentation'); ?>" target="_blank"><?php echo $this->l('Documentation'); ?></a> | </li>
<li><a href="http://www.prestashop.com/contact.php" title="<?php echo $this->l('Contact us!'); ?>" target="_blank"><?php echo $this->l('Contact us!'); ?></a> | </li>
<li><a href="http://www.prestashop.com/contact.php" title="<?php echo $this->l('Contact us'); ?>" target="_blank"><?php echo $this->l('Contact us'); ?></a> | </li>
<li>&copy; 2005-<?php echo date('Y'); ?></li>
</ul>
<script type="text/javascript">
+1 -1
View File
@@ -76,7 +76,7 @@
<div id="sheets" class="sheet shown">
<div id="sheet_<?php echo $this->step ?>" class="sheet shown clearfix">
<div class="contentTitle">
<h1><?php echo $this->l('menu_'.$this->step) ?></h1>
<h1><?php echo $this->l('Installation wizard') ?></h1>
<ul id="stepList_1" class="stepList clearfix">
<?php foreach ($this->getSteps() as $step): ?>
+9 -13
View File
@@ -39,12 +39,12 @@
<!-- Did you know -->
<h3 class="no-margin"><?php echo $this->l('Did you know?'); ?></h3>
<p><?php echo $this->l('PrestaShop and its community offers over 40 different languages for free, directly accessible from your Back Office on the Localization tab.'); ?> </p>
<p><?php echo $this->l('PrestaShop and its community offers over %d different languages for free, directly accessible from your Back Office on the Localization tab.', 56); ?> </p>
<!-- License agreement -->
<h2 id="licenses-agreement"><?php echo $this->l('Licenses Agreement') ?></h2>
<h2 id="licenses-agreement"><?php echo $this->l('License Agreements') ?></h2>
<p><strong><?php echo $this->l('PrestaShop core is released under the OSL 3.0 while PrestaShop modules and themes are released under the AFL 3.0.') ?></strong></p>
<div style="height:200px; border:1px solid #ccc; margin-bottom:8px; padding:5px; background:#fff; overflow: auto; overflow-x:hidden; overflow-y:scroll;">
<p><strong><?php echo $this->l('PrestaShop core is released under the OSL 3.0 while PrestaShop modules and themes are released under the AFL 3.0.') ?></strong></p>
<h3>Core: Open Software License ("OSL") v. 3.0</h3>
<p>This Open Software License (the "License") applies to any original work of authorship (the "Original Work") whose owner (the "Licensor") has placed the following licensing notice adjacent to the copyright notice for the Original Work:</p>
<h4>Licensed under the Open Software License version 3.0</h4>
@@ -100,16 +100,12 @@
<p><strong>16. Modification of This License.</strong> This License is Copyright © 2005 Lawrence Rosen. Permission is granted to copy, distribute, or communicate this License without modification. Nothing in this License permits You to modify this License as applied to the Original Work or to Derivative Works. However, You may modify the text of this License and copy, distribute or communicate your modified version (the "Modified License") and apply it to other original works of authorship subject to the following conditions: (i) You may not indicate in any way that your Modified License is the "Academic Free License" or "AFL" and you may not use those names in the name of your Modified License; (ii) You must replace the notice specified in the first paragraph above with the notice "Licensed under &lt;insert your license name here&gt;" or with a notice of your own that is not confusingly similar to the notice in this License; and (iii) You may not claim that your original works are open source software unless your Modified License has been approved by Open Source Initiative (OSI) and You comply with its license review and certification process.</p>
</div>
<p>
<label>
<input type="checkbox" id="set_license" class="required" name="licence_agrement" value="1" style="vertical-align: middle;" <?php if ($this->session->licence_agrement): ?>checked="checked"<?php endif; ?> />
<strong><?php echo $this->l('I agree to the above terms and conditions.') ?></strong>
</label>
<div>
<label><input type="checkbox" id="set_license" class="required" name="licence_agrement" value="1" style="vertical-align: middle;float:left" <?php if ($this->session->licence_agrement): ?>checked="checked"<?php endif; ?> />
<div style="float:left;width:600px;margin-left:8px"><strong><?php echo $this->l('I agree to the above terms and conditions.') ?></strong></div></label>
<br />
<label>
<input type="checkbox" name="configuration_agrement" value="1" style="vertical-align: middle;" <?php if ($this->session->configuration_agrement): ?>checked="checked"<?php endif; ?> />
<strong><?php echo $this->l('I agree to participate in improving the solution by sending anonymous information about my configuration.') ?></strong>
</label>
</p>
<label><input type="checkbox" name="configuration_agrement" value="1" style="vertical-align: middle;float:left" <?php if ($this->session->configuration_agrement): ?>checked="checked"<?php endif; ?> />
<div style="float:left;width:600px;margin-left:8px"><strong><?php echo $this->l('I agree to participate in improving the solution by sending anonymous information about my configuration.') ?></strong></div></label>
</div>
<?php $this->displayTemplate('footer') ?>
+10
View File
@@ -10,6 +10,16 @@ UPDATE `PREFIX_customer` c, `PREFIX_orders` o SET c.id_lang = o.id_lang WHERE c.
UPDATE `PREFIX_quick_access` SET `link` = 'index.php?controller=AdminCartRules&addcart_rule' WHERE `link` = 'index.php?tab=AdminDiscounts&adddiscount';
ALTER TABLE `PREFIX_order_cart_rule` ADD `free_shipping` BOOLEAN NOT NULL DEFAULT FALSE AFTER `value_tax_excl`;
UPDATE `PREFIX_order_cart_rule` ocr, `PREFIX_cart_rule` cr SET ocr.free_shipping = 1 WHERE ocr.id_cart_rule = cr.id_cart_rule AND cr.free_shipping = 1;
UPDATE `PREFIX_orders` o, `PREFIX_order_cart_rule` ocr SET
o.`total_discounts` = o.total_discounts + o.`total_shipping_tax_incl`,
o.`total_discounts_tax_incl` = o.`total_discounts_tax_incl` + o.`total_shipping_tax_incl`,
o.`total_discounts_tax_excl` = o.`total_discounts_tax_excl` + o.`total_shipping_tax_excl`
WHERE o.id_order = ocr.id_order AND ocr.free_shipping = 1;
CREATE TABLE `PREFIX_tab_module_preference` (
`id_tab_module_preference` int(11) NOT NULL auto_increment,
`id_employee` int(11) NOT NULL,