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

[-] Classes : fixed bug #PSTEST-550 - Add current_state attribute on Order class

Browse Source 
[~] Deprecated : OrderHistory::getLastOrderState()

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12898 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
aFolletete
2012-02-01 14:34:17 +00:00
parent 558efddd17
commit 5615dca5c1
7 changed files with 48 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
install-dev/data/db_structure.sql
+1
View File
@@ -1020,6 +1020,7 @@ CREATE TABLE `PREFIX_orders` (
`id_currency` int(10) unsigned NOT NULL,
`id_address_delivery` int(10) unsigned NOT NULL,
`id_address_invoice` int(10) unsigned NOT NULL,
`current_state` int(10) unsigned NOT NULL,
`secure_key` varchar(32) NOT NULL default '-1',
`payment` varchar(255) NOT NULL,
`conversion_rate` decimal(13,6) NOT NULL default 1,
install-dev/fixtures/apple/data/customer.xml
+1 -1
View File
@@ -19,7 +19,7 @@
<field name="is_guest"/>
</fields>
<entities>
<customer id="John" id_gender="" id_default_group="3" firstname="John" lastname="DOE" passwd="291ef87dd3531037a5f81c19036f2510" last_passwd_gen="2012-01-02 05:14:05" birthday="1970-01-15" newsletter="1" ip_registration_newsletter="" newsletter_date_add="0000-00-00 00:00:00" optin="1" secure_key="ec04c88d18dc5f8d86ff2a3754daa421" active="1" is_guest="0">
<customer id="John" id_gender="" id_default_group="3" firstname="John" lastname="DOE" passwd="75b019568bc6c84dda367661e855bdc2" last_passwd_gen="2012-02-01 09:08:06" birthday="1970-01-15" newsletter="1" ip_registration_newsletter="" newsletter_date_add="0000-00-00 00:00:00" optin="1" secure_key="b59e02456693eb0903a3645512ac9e1a" active="1" is_guest="0">
<email>pub@prestashop.com</email>
<note/>
</customer>
install-dev/fixtures/apple/data/orders.xml
+2 -1
View File
@@ -10,6 +10,7 @@
<field name="id_currency"/>
<field name="id_address_delivery" relation="address"/>
<field name="id_address_invoice" relation="address"/>
<field name="current_state"/>
<field name="secure_key"/>
<field name="payment"/>
<field name="conversion_rate"/>
@@ -40,7 +41,7 @@
<field name="valid"/>
</fields>
<entities>
<orders id="orders_1" reference="XKBKNABJ" id_group_shop="1" id_shop="1" id_carrier="My_carrier" id_customer="John" id_cart="cart_1" id_currency="1" id_address_delivery="Mon_adresse" id_address_invoice="Mon_adresse" secure_key="47ce86627c1f3c792a80773c5d2deaf8" conversion_rate="1.000000" recyclable="0" gift="0" shipping_number="" total_discounts="0.00" total_discounts_tax_incl="0.00" total_paid="626.37" total_paid_tax_incl="626.37" total_paid_tax_excl="523.72" total_paid_real="626.37" total_products="516.72" total_products_wt="618.00" total_shipping="7.98" total_shipping_tax_incl="8.37" total_shipping_tax_excl="7.00" carrier_tax_rate="19.600" total_wrapping="0.00" total_wrapping_tax_incl="0.00" total_wrapping_tax_excl="0.00" invoice_number="0" delivery_number="0" invoice_date="0000-00-00 00:00:00" delivery_date="0000-00-00 00:00:00" valid="0">
<orders id="orders_1" reference="XKBKNABJ" id_group_shop="1" id_shop="1" id_carrier="My_carrier" id_customer="John" id_cart="cart_1" id_currency="1" id_address_delivery="Mon_adresse" id_address_invoice="Mon_adresse" current_state="1" secure_key="47ce86627c1f3c792a80773c5d2deaf8" conversion_rate="1.000000" recyclable="0" gift="0" shipping_number="" total_discounts="0.00" total_discounts_tax_incl="0.00" total_paid="626.37" total_paid_tax_incl="626.37" total_paid_tax_excl="523.72" total_paid_real="626.37" total_products="516.72" total_products_wt="618.00" total_shipping="7.98" total_shipping_tax_incl="8.37" total_shipping_tax_excl="7.00" carrier_tax_rate="19.600" total_wrapping="0.00" total_wrapping_tax_incl="0.00" total_wrapping_tax_excl="0.00" invoice_number="0" delivery_number="0" invoice_date="0000-00-00 00:00:00" delivery_date="0000-00-00 00:00:00" valid="0">
<payment>Chèque</payment>
<module>cheque</module>
<gift_message/>
install-dev/upgrade/sql/1.5.0.4.sql
+2
View File
@@ -46,3 +46,5 @@ ALTER TABLE `PREFIX_cart_rule_product_rule` CHANGE `id_cart_rule` `id_product_ru
ALTER TABLE `PREFIX_cart_rule_product_rule` CHANGE `type` `type` ENUM('products', 'categories', 'attributes', 'manufacturers', 'suppliers') NOT NULL;
ALTER TABLE `PREFIX_cart_rule` ADD `partial_use` tinyint(1) unsigned NOT NULL default 0 AFTER `priority`;
ALTER TABLE `PREFIX_orders` ADD `current_state` int(10) unsigned NOT NULL default 0 AFTER `id_address_invoice`;