Commit Graph

190 Commits

Author SHA1 Message Date
Marion Muszynski
a9a557adf9 show if order comes from api or website 2017-11-20 11:32:59 +01:00
Michael RICOIS
a6942a1356 Add a var when shipping is refund 2017-11-14 11:37:27 +01:00
Michael RICOIS
ccd3ebb1df Merge branch 'ticket-14666-appli-discount' 2017-11-08 10:35:44 +01:00
Michael RICOIS
2fb0bd187d Discount only for applications 2017-11-06 12:00:30 +01:00
Michael RICOIS
bee38c462b Add condition following number of orders 2017-10-31 16:45:07 +01:00
Michael RICOIS
7bd7624200 Add sponsor from backoffice 2017-10-31 12:24:29 +01:00
Marion Muszynski
1dc2a7f6b2 fix conflict 2017-10-17 16:29:54 +02:00
Marion Muszynski
5600a6da36 fix returnable qty 2017-10-11 16:14:59 +02:00
Marion Muszynski
902de142ed indication of shipping everywhere 2017-10-11 13:24:49 +02:00
Marion Muszynski
bd9cdc9cad add button to clean image positions 2017-10-10 15:29:25 +02:00
Marion Muszynski
ad291c9f99 move mobile imgage upload to adminprivatesalesale 2017-09-28 15:38:03 +02:00
Marion Muszynski
d286b61147 select distinct shipp numbers 2017-09-27 12:29:13 +02:00
Michael RICOIS
389c34f82e Merge branch 'ticket-14162-returnwithqty' 2017-09-26 15:35:10 +02:00
Michael RICOIS
96fe0dcd67 Update product-box size and truncate 2017-09-26 15:26:48 +02:00
Michael RICOIS
91e7139f34 Manage quantity in return form 2017-09-25 17:58:47 +02:00
Marion Muszynski
801cb2af23 add delete function for category mobile image 2017-09-25 10:59:34 +02:00
Marion Muszynski
7bbcc3eb59 add expedition date on adminorder 2017-09-22 15:31:16 +02:00
Michael RICOIS
bfae895cf1 Fix currentIndex 2017-09-15 16:19:44 +02:00
Michael RICOIS
e8fbfd92af Add root category 2017-09-15 16:13:15 +02:00
Michael RICOIS
8728d37bea Display category children tree in a select 2017-09-15 10:57:16 +02:00
Marion Muszynski
bb7f8474e7 fix css and show ordered quantity 2017-09-12 11:26:39 +02:00
Marion Muszynski
e272bede0e select product name from order detail for sav 2017-09-12 11:12:31 +02:00
Marion Muszynski
b46e35c500 indication of order carrier in order list 2017-08-25 10:44:59 +02:00
Marion Muszynski
13576c64d8 fix conflicts 2017-08-21 11:04:16 +02:00
Marion Muszynski
e4c877bd71 precheck gift option in admin invoices 2017-08-21 11:00:31 +02:00
Marion Muszynski
4a5aa5c7c4 add discount and mr shipping numbers 2017-08-17 15:52:58 +02:00
Marion Muszynski
e6a7ab447d add name of product in demand in adminOrder 2017-07-28 12:36:49 +02:00
root
74b797960e fix legend from prod 2017-07-26 15:34:17 +02:00
Marion Muszynski
4acbde0319 add module alerthack to prevent hacker to post 2017-07-26 11:09:47 +02:00
Marion Muszynski
06338522e6 Merge branch 'ticket-12743-SavSupplier' 2017-07-24 16:56:15 +02:00
Marion Muszynski
4589c86bb5 add module ant supplier demand 2017-07-13 16:46:11 +02:00
Marion Muszynski
adf8bc8185 add module custom group 2017-07-12 17:14:30 +02:00
Marion Muszynski
fd18fd3421 Merge branch 'ticket11985-invoiceMR' 2017-07-05 12:19:31 +02:00
Marion Muszynski
c4193b7119 hide error message after 4s 2017-07-05 12:19:14 +02:00
Marion Muszynski
4df600b0cc add error message 2017-07-05 12:13:40 +02:00
Marion Muszynski
ec2f428160 Merge branch 'ticket11985-invoiceMR' 2017-07-04 17:51:54 +02:00
Marion Muszynski
a0e0aa7d71 change redirect 2017-07-04 17:51:34 +02:00
Marion Muszynski
91536bdb4d Merge branch 'ticket11985-invoiceMR' 2017-07-04 16:23:26 +02:00
Marion Muszynski
a38cc1a255 remove var dump 2017-07-04 15:54:02 +02:00
Marion Muszynski
c6c5ad32ca fix delete customer 2017-06-28 15:00:53 +02:00
Marion Muszynski
a2a0385822 upgrading of return process 2017-06-26 11:52:56 +02:00
Marion Muszynski
1524ec205c Merge branch 'ticket-13532-ProductDisable' 2017-06-20 11:46:50 +02:00
Marion Muszynski
92bd1d406d fix css 2017-06-20 10:59:11 +02:00
Marion Muszynski
1f971275a0 multiple disable/enable product 2017-06-20 10:09:07 +02:00
Marion Muszynski
12e744b313 Merge branch 'ticket-9103-UrlMetaCategory' 2017-06-20 09:51:32 +02:00
Marion Muszynski
15e76afb93 multi disable/enable product 2017-06-19 17:48:38 +02:00
Marion Muszynski
fec2e5ba19 remove add buttom 2017-06-19 12:18:25 +02:00
Marion Muszynski
dadf16f8fb separate la poste invoices and mr invoices 2017-06-16 17:51:19 +02:00
Marion Muszynski
dde433e46a start of changement 2017-06-16 14:49:10 +02:00
Marion Muszynski
645926e5ed fix image legend for es 2017-06-12 15:30:27 +02:00