dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
19,089 Commits 9 Branches 19 Tags
bb35a5b00414bbca76569fa2b9d5df875f6b0140
Commit Graph

240 Commits

Author SHA1 Message Date
Damien Metzger
1870dd4dd2 // Added order state color in order::getHistory() 2013-10-09 15:33:46 +02:00
soufyan
cd7d604b75 [*] Project : Orders should rely only on ps_order_cart_rule 2013-09-03 15:10:06 +02:00
Vincent Augagneur
99b162d16b [-] CORE : fixed bug #PSCFV-10175 - No virtuel download email send after accepted payment 2013-08-27 10:09:35 +02:00
gRoussac
a1786b97b3 [-] FO : expiration date not displayed in email for downloadable product 2013-08-07 17:08:50 +02:00
jeromenadaud
9ff0d60158 [-] BO : FixBug #PSCFV-7839 No invoice file attached to payment email confirmation 2013-08-05 09:41:46 +02:00
Rémi Gaillard
c0cf92cbdf [+] BO: Add a wizard to create and edit your carriers 2013-07-26 18:27:21 +02:00
gRoussac
42c5335f27 [*] WS : order history add(POST) send customer email if sendemail=1 url parameter, thanks @gerdus 2013-07-26 17:55:53 +02:00
Damien Metzger
c829ac5b7d // Fixed fix 2013-07-23 14:19:13 +02:00
Damien Metzger
4b6642d76c // Small optimization 2013-07-23 09:50:25 +02:00
Gregory Roussac
cf04c18ce6 Merge pull request #537 from PrestaEdit/patch-43 
[-] FO: OrderHistory - Unclosed tag
 2013-07-17 08:53:31 -07:00
Axome
1c960da57a [*] BO : Not increment stock if statut change fom Error to Canceled 
Not increment stock if statut change fom Error => Canceled or Canceled => Error (stock should stay the same).
Add a code simplification too
 2013-07-12 11:22:42 +02:00
Rémi Gaillard
f413d9e6e6 [-] Core: Fix #PSCFV-9652 too much payments for multishipping orders 2013-07-08 16:07:20 +02:00
PrestaEdit
86bdcd99e9 [-] FO: OrderHistory - Unclosed tag 2013-07-02 17:08:49 +02:00
Rémi Gaillard
6b71ec8b09 [-] BO: product supplier price should not be converted on product page #PSCFV-9420 2013-07-02 15:45:12 +02:00
Damien Metzger
56aab3c676 // Fixed references to a "conversion rate" that was in fact the "exchange rate" 2013-07-01 12:14:50 +02:00
gRoussac
f824b537cf [-] BO : Fix bug #PSCFV-8619 update order weight when modifying products 2013-07-01 11:32:09 +02:00
gRoussac
21d04cb423 [-] BO : Fix bug #PSCFV-9264 bad cancel qty when refund / return 2013-06-20 18:21:55 +02:00
Rémi Gaillard
1838003353 [-] WS: Fix #PSCFI-7009 product prices on orders with specific prices 2013-06-10 16:59:02 +02:00
Rémi Gaillard
4c5b060e92 [-] Core: Hook actionPaymentConfirmation should also be called for PS_OS_WS_PAYMENT order statuse 2013-06-04 12:08:31 +02:00
Rémi Gaillard
6d84d5833d [-] FO: Fix Order::getOrdersTotalPaid() reference is now a string #PSCFV-9342 2013-06-03 11:49:55 +02:00
vAugagneur
3328c7a653 [-] BO : remove deprecated parameter when call Tools::displayDate() 2013-05-20 16:55:52 +02:00
Rémi Gaillard
41786587ba [-] BO: Fix #PSCFV-8179 shop domain used in emails sometimes was for the wrong shop 2013-05-02 18:42:01 +02:00
vAugagneur
a0867d3a92 [-] CORE : fixed PHP Notice: Undefined index: date_expiration on virtual product 2013-04-26 10:15:54 +02:00
Francois Gaillard
8d735b333f // Release branch merged 2013-04-25 17:00:56 +02:00
Damien Metzger
6f96f0ac9a [-] FO : invoice: do not display taxes table if there is not tax to display 2013-04-23 16:46:11 +02:00
gRoussac
c5ed733cfc [-] CORE : Fix bug #PSCFV-8705 stocks update for when no current state 2013-04-22 12:09:35 +02:00
gRoussac
1acd07e063 [-] CORE :Fix #PSCFV-8631 when order directly in payment state does not update stocks 2013-04-22 11:33:13 +02:00
gRoussac
6384a74c1d [-] BO : Fix bug : #PSCFV-8631 no download-product.tpl in languages packs 2013-04-08 10:50:03 +02:00
PrestaEdit
87b7be46de [-] Class: Order / Param Module 
This param is required.
 2013-04-03 00:59:49 +03:00
Francois Gaillard
77871338c6 // Release branch merged 2013-03-27 10:25:16 +01:00
Damien Metzger
51bac2107f // Made order message checks more flexible #PSCFV-8123 2013-03-19 16:39:02 +01:00
Rémi Gaillard
f483feb53d [-] Core: Fix #PSCFV-8293 bad sql vars name on Order::getShipping() #PSCFV-8293 2013-03-18 11:05:06 +01:00
Rémi Gaillard
e1bb55dbba // Clean order_detail_tax table after deleting an order detail #PSCFV-8278 2013-03-15 11:51:19 +01:00
Damien Metzger
8885c3f642 [+] Core : added a boolean in the database (guest/cart/order) in order to know if the customer used the mobile theme for the order 2013-02-28 15:23:21 +01:00
Rémi Gaillard
f6f1cb409a [-] BO: Fix #PSCFV-7734 multiple order delivery number for the same order 2013-02-15 16:24:46 +01:00
Rémi Gaillard
0caea77c36 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-02-04 16:05:17 +01:00
Rémi Gaillard
44d26d5804 [-] BO: Fix id_shop for configuration variables in global context for orders 2013-02-04 16:05:01 +01:00
Damien Metzger
2bf3df1c7d [-] Core : Fixed a lot of issue with free shipping vouchers #PSCFV-7325 2013-02-04 16:00:46 +01:00
Rémi Gaillard
d72ce0d892 [-] BO: get the invoice prefix from the right shop 2013-02-04 15:11:29 +01:00
Damien Metzger
067e055858 Merge pull request #164 from Shagshag/patch-7 
[-] BO : OrderHistory::changeIdOrderState
 2013-02-01 10:00:10 -08:00
Rémi Gaillard
f9f24aef84 [-] FO: Fix #PSCFV-7530 bad quantity returned displayed on order detail for multiple return 2013-01-31 15:10:52 +01:00
vAugagneur
459ce4fab8 [-] CORE : email with virtual products info was not send to the customer 2013-01-22 11:23:05 +01:00
Shagshag
868effab13 [-] Fix: OrderHistory::changeIdOrderState 
&$id_order break compatibility with existing codes :

1/ it's unnecessary : Objects are passed by references by default
2/ it causes fatal errors: 
```PHP
$foo->changeIdOrderState((int)$id_order_state, (int)$id_order);
```
Fatal error: Only variables can be passed by reference
 2013-01-08 10:51:42 +01:00
Francois Gaillard
8baf87eef5 // Welcome 2013 2013-01-04 11:19:03 +01:00
vAugagneur
bfff958b1f Merge pull request #75 from @sebastienhouzet 2012-12-12 11:24:56 +01:00
vAugagneur
885e44c58d //fixed code error in a pull request 2012-11-26 10:09:27 +01:00
PrestaEdit
dc43452f8d // Class OrderHistory: changeIdOrderState() & Order current_state 2012-11-25 22:42:31 +01:00
vAugagneur
be946319be //remove svn keyword @version Release: $ 2012-11-22 11:57:40 +01:00
dMetzger
3166887d0e [-] FO : replaced order id by order reference in the contact form (but kept the id_order for retrocompatibility) #PSCFV-5491 2012-11-14 14:47:26 +00:00
vAugagneur
1415f86566 //fix for 1.5.2.0 2012-10-22 12:41:28 +00:00