dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[*] Core: you can now associate modules to order states in order to add extra mail vars

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16618 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
rGaillard
2012-07-31 09:18:41 +00:00
parent 58f7fb1c03
commit b37a36eba5
9 changed files with 41 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
install-dev/data/db_structure.sql
+4 -2
View File
@@ -1264,7 +1264,8 @@ CREATE TABLE `PREFIX_order_slip_detail` (
CREATE TABLE `PREFIX_order_state` (
`id_order_state` int(10) UNSIGNED NOT NULL auto_increment,
`invoice` tinyint(1) UNSIGNED default '0',
`send_email` tinyint(1) UNSIGNED NOT NULL default '0',
`send_email` tinyint(1) UNSIGNED NOT NULL default '0',
`module_name` VARCHAR(255) NULL DEFAULT NULL,
`color` varchar(32) default NULL,
`unremovable` tinyint(1) UNSIGNED NOT NULL,
`hidden` tinyint(1) UNSIGNED NOT NULL default '0',
@@ -1273,7 +1274,8 @@ CREATE TABLE `PREFIX_order_state` (
`shipped` tinyint(1) UNSIGNED NOT NULL default '0',
`paid` tinyint(1) UNSIGNED NOT NULL default '0',
`deleted` tinyint(1) UNSIGNED NOT NULL default '0',
PRIMARY KEY (`id_order_state`)
PRIMARY KEY (`id_order_state`),
KEY `module_name` (`module_name`)
) ENGINE=ENGINE_TYPE DEFAULT CHARSET=utf8;
CREATE TABLE `PREFIX_order_state_lang` (
install-dev/data/xml/order_state.xml
+3 -2
View File
@@ -3,6 +3,7 @@
<fields id="name" class="OrderState" image="os">
<field name="invoice"/>
<field name="send_email"/>
<field name="module_name"/>
<field name="color"/>
<field name="unremovable"/>
<field name="hidden"/>
@@ -12,7 +13,7 @@
<field name="paid"/>
</fields>
<entities>
<order_state id="Awaiting_cheque_payment" invoice="0" send_email="1" color="RoyalBlue" unremovable="1" hidden="0" logable="0" delivery="0" shipped="0" paid="0"/>
<order_state id="Awaiting_cheque_payment" invoice="0" send_email="1" module_name="cheque" color="RoyalBlue" unremovable="1" hidden="0" logable="0" delivery="0" shipped="0" paid="0"/>
<order_state id="Payment_accepted" invoice="1" send_email="1" color="LimeGreen" unremovable="1" hidden="0" logable="1" delivery="0" shipped="0" paid="1"/>
<order_state id="Preparation_in_progress" invoice="1" send_email="1" color="DarkOrange" unremovable="1" hidden="0" logable="1" delivery="1" shipped="0" paid="1"/>
<order_state id="Shipped" invoice="1" send_email="1" color="BlueViolet" unremovable="1" hidden="0" logable="1" delivery="1" shipped="1" paid="1"/>
@@ -21,7 +22,7 @@
<order_state id="Refund" invoice="1" send_email="1" color="#ec2e15" unremovable="1" hidden="0" logable="0" delivery="0" shipped="0" paid="0"/>
<order_state id="Payment_error" invoice="0" send_email="1" color="#8f0621" unremovable="1" hidden="0" logable="0" delivery="0" shipped="0" paid="0"/>
<order_state id="On_backorder" invoice="1" send_email="1" color="HotPink" unremovable="1" hidden="0" logable="0" delivery="0" shipped="0" paid="1"/>
<order_state id="Awaiting_bank_wire_payment" invoice="0" send_email="1" color="RoyalBlue" unremovable="1" hidden="0" logable="0" delivery="0" shipped="0" paid="0"/>
<order_state id="Awaiting_bank_wire_payment" invoice="0" send_email="1" module_name="bankwire" color="RoyalBlue" unremovable="1" hidden="0" logable="0" delivery="0" shipped="0" paid="0"/>
<order_state id="Awaiting_PayPal_payment" invoice="0" send_email="0" color="RoyalBlue" unremovable="1" hidden="0" logable="0" delivery="0" shipped="0" paid="0"/>
<order_state id="Payment_remotely_accepted" invoice="1" send_email="0" color="LimeGreen" unremovable="1" hidden="0" logable="1" delivery="0" shipped="0" paid="1"/>
</entities>