Commit Graph

128 Commits

Author SHA1 Message Date
fBrignoli
39ee88bdf2 [-] BO : Incorrect CartRule value
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10650 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-25 10:34:43 +00:00
tDidierjean
62422904f3 // change to orders list display
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10648 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-25 10:13:49 +00:00
aFolletete
04a3aab393 // WAOW ! Adding change currency feature in AdminOrdersController ! It's amaizing :D Wonderful ;)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10635 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-23 23:04:33 +00:00
fSerny
f5aadafc92 [-] BO : Partial refund - part 4
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10626 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-23 22:42:17 +00:00
fSerny
3c7d9ba53b [*] BO : Partial refund - part 3
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10611 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-23 21:42:27 +00:00
fSerny
ac24d5ddd8 [-] BO : Load customer and cart in AdminOrderController init to fix a bug with CancelProduct
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10601 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-23 20:52:37 +00:00
dMetzger
f670f7573f [+] BO : add new feature, Order edition
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10579 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-23 17:45:52 +00:00
rGaillard
06ab93a8f6 // ajax process off adminaccess is now in the controller
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10503 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-23 10:01:22 +00:00
bMancone
276f493dd7 // StockAvailable: updated synchronize() and updated its usage within the different stock controllers when necessary
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10331 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-21 11:01:33 +00:00
tDidierjean
5b908a0844 // fix tpl folder detection in BO
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10327 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-21 10:11:49 +00:00
mDeflotte
5e6ab08a00 // Merging multishipping branche on 1.5
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10259 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-18 11:13:31 +00:00
mMarinetti
257ff5c380 // fixed AdminOrders display view
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10166 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-16 10:49:30 +00:00
bMancone
fdab7ebc70 // Warehouse: getWarehouseList is now getWarehouses. Employee: it is not possible to delete an employee if he manages warehouses, anymore.
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10103 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-14 14:28:30 +00:00
rGaillard
07ced238d1 // Fix order view
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10078 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-14 09:16:37 +00:00
mMarinetti
afe8a4cc52 // die2Exception
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10073 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-13 19:44:49 +00:00
rGaillard
e2026d1cc3 // Replacement of getDiscounts method
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9900 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-04 16:52:39 +00:00
dSevere
250546f245 // #PSFV-94 : add product management on suppliers order + Submit button integrated to the toolbar on add/edit form view + adaptations after form and list helper update + bugs fix
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9864 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-03 17:54:55 +00:00
tDidierjean
e00763b927 // change to price parameter in list
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9863 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-03 17:49:30 +00:00
tDidierjean
a6367738ca // AdminController refactoring
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9825 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-03 11:12:18 +00:00
rGaillard
33ecd84fb1 // little fix on backoffice order
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9792 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-02 12:32:57 +00:00
fSerny
0ba4fe9c7e [*] PROJECT : New Module API (part 1)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9790 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-02 10:49:01 +00:00
rGaillard
903d9b783a [+] BO: Add BackOffice orders
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9776 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-02 09:18:45 +00:00
vSchoener
11c86e7e66 [+] CORE: OrderControler display the payment_cc detail for an order, transaction_id can be changed manually
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9629 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-25 13:46:37 +00:00
vSchoener
b5d6af8aa5 [-] CORE: Add details payment from payment_cc in the order view
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9618 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-25 09:09:06 +00:00
aFolletete
1122f9a28e // fixed order of Orders in AdminOrdersController
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9599 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-24 14:47:33 +00:00
mDeflotte
378b1386c3 // BugFix with order states change and warehouse
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9596 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-24 14:32:57 +00:00
aFolletete
14632c7fbe // bug fix on new AdminOrders + optimization
[~] FO : usage of $customizedDatas var in order-detail.tpl is now deprecated use $product.customizedDatas

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9589 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-24 13:19:54 +00:00
aFolletete
ed36aa6971 [*] BO : #PSFV-94 - new controller for AdminOrders
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9546 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-21 13:53:54 +00:00