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

124 Commits

Author SHA1 Message Date
Kevin Granger
67dc7aac04 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap 
Conflicts:
	admin-dev/themes/default/template/controllers/carrier_wizard/helpers/form/form_ranges.tpl
	admin-dev/themes/default/template/controllers/groups/helpers/view/view.tpl
	admin-dev/themes/default/template/controllers/import/helpers/form/form.tpl
	admin-dev/themes/default/template/controllers/modules/filters.tpl
	admin-dev/themes/default/template/controllers/modules/list.tpl
	admin-dev/themes/default/template/controllers/orders/form.tpl
	admin-dev/themes/default/template/helpers/form/form.tpl
	classes/Category.php
	classes/controller/AdminController.php
	controllers/admin/AdminAttributesGroupsController.php
	controllers/admin/AdminFeaturesController.php
	controllers/admin/AdminImportController.php
	controllers/admin/AdminLogsController.php
	install-dev/install_version.php
	install-dev/langs/ru/data/tab.xml
	js/admin_carrier_wizard.js
	modules/loyalty/loyalty.php
 2013-10-14 12:21:29 +02:00
Jerome Nadaud
f6bbb6e241 // Fix duplicate invoice delivery number 2013-10-09 17:43:43 +02:00
Jerome Nadaud
68d84892c7 // remove self:: 2013-10-09 16:40:09 +02:00
Jerome Nadaud
d0a4636966 [-] BO : FixBug #PSCFV-9957 - Duplicate order invoice number 2013-10-09 16:29:15 +02:00
Damien Metzger
1870dd4dd2 // Added order state color in order::getHistory() 2013-10-09 15:33:46 +02:00
PhpMadman
e38d808a85 [*] BO: wrong description on getIdOrderCarrier 2013-10-03 15:51:27 +02:00
soufyan
cd7d604b75 [*] Project : Orders should rely only on ps_order_cart_rule 2013-09-03 15:10:06 +02:00
Rémi Gaillard
c0cf92cbdf [+] BO: Add a wizard to create and edit your carriers 2013-07-26 18:27:21 +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
Rémi Gaillard
f413d9e6e6 [-] Core: Fix #PSCFV-9652 too much payments for multishipping orders 2013-07-08 16:07:20 +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
6d84d5833d [-] FO: Fix Order::getOrdersTotalPaid() reference is now a string #PSCFV-9342 2013-06-03 11:49:55 +02:00
PrestaEdit
87b7be46de [-] Class: Order / Param Module 
This param is required.
 2013-04-03 00:59:49 +03: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
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
Francois Gaillard
8baf87eef5 // Welcome 2013 2013-01-04 11:19:03 +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
lLefevre
6588f9514c // Revert Revision 17884 : #PSCFV-5017 : update bad licenses in all files 2012-10-17 09:29:43 +00:00
lLefevre
398d345362 // #PSCFV-5017 : update bad licenses in all files 2012-10-17 06:18:59 +00:00
rGaillard
d1959d1d5b // Fix #PSCFV-4916 2012-10-12 13:25:12 +00:00
rGaillard
c3a9472414 // Fix #PSCFV-4136 2012-09-17 17:36:11 +00:00
rGaillard
a45ef3436a // Fix #PSCFV-4033 2012-09-13 14:25:32 +00:00
rGaillard
f7bd5e3d56 // Small fix 2012-09-06 09:19:31 +00:00
dMetzger
060e626f98 // Huge code cleaning on order edition, a lot of values were inconsistent 2012-08-13 16:26:40 +00:00
dMetzger
57912f6fef // Order::_deleteProduct rewritten (a lot of fields were missing) 2012-08-13 16:04:34 +00:00
rGaillard
c7105bfe11 [-] BO: Invoices and products order detail are now not empty after deleting a product 2012-08-07 12:20:10 +00:00
rGaillard
324b06cfac [-] BO: Fix PSCFV-2994 2012-08-01 14:43:44 +00:00
mDeflotte
321cf45847 [-] FO : #PSCFV-3318 - Guest Tracking must use order reference and not order id 2012-07-25 13:00:43 +00:00
fBrignoli
6e1dda9572 [-] PDF : Canadian taxes 2012-07-12 16:45:14 +00:00
mDeflotte
4c5cce43e1 [-] BO : #PSCFV-3000 - Send an email on changing an order from the BO 2012-07-12 12:05:19 +00:00
mDeflotte
330b85cfe2 [-] BO : #PSCFV-3112 - Fix bug with payment by cheque and multishipping 2012-07-09 16:30:12 +00:00
lLefevre
a83e98e2cf [-] BO : #PSCFV-3036 : fix bug and fix notice and fix deprecated function 2012-07-05 15:35:13 +00:00
mDeflotte
933de92c01 [-] BO : #PSCFV-3011 - Add details of refund and returned products on the BO order page. 2012-07-05 07:40:11 +00:00
mDeflotte
7c18909e68 // Change commentaries 2012-06-26 15:24:10 +00:00
mDeflotte
f981d8f37b [-] FO : #PSCFV-2920 - Hidding order number, use order reference instead 2012-06-26 15:19:35 +00:00
aFolletete
313aac8a53 [-] Classes : fixed bug #PSCFV-2681 - issue with updating of current_state column on order table 2012-06-06 15:00:52 +00:00
mDeflotte
99e7a51394 // Fix little bug (undefined index) on canceling a product (BO order tab) 2012-06-04 12:26:55 +00:00
mDeflotte
cabfd25f8a // Fix bug with bad SQL request on changing state of an order paid by check 2012-06-04 09:09:51 +00:00
mDeflotte
c060909bd1 [-] Project : #PSCFV-2633 #PSCFV-2622 - Fix problems with multishipping and order payment & invoice 2012-06-01 15:40:32 +00:00
rMalie
2765d931e9 // Webservice getters are now multishop 2012-06-01 07:45:41 +00:00