Commit Graph

298 Commits

Author SHA1 Message Date
Marion Muszynski
c25d0551cd remove console log 2017-10-30 14:41:37 +01:00
Marion Muszynski
07dd8ab9c9 test flush cache sale 2017-10-30 13:41:50 +01:00
Marion Muszynski
20ab1d75d9 change to update img promo banner 2017-10-24 18:24:17 +02: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
Marion Muszynski
8fb28292b8 add drop shipping 2017-09-26 14:53:38 +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
Marion Muszynski
4b985fb501 Merge branch 'ticket-13943-ResetBOpassword' 2017-09-21 15:40:57 +02:00
Marion Muszynski
31e6272a31 add mail for reset password 2017-09-21 15:26:55 +02:00
Michael RICOIS
f0e00394fa Clean ajax and add parameter to not loop in categoryUpdate hook 2017-09-18 17:44:09 +02:00
Marion Muszynski
d8c2c369c9 reset password 2017-09-18 11:00:12 +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
root
91e4537e41 fix and trad from prod 2017-09-13 10:28:19 +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
a76dd668fe addition of resetbopassword module 2017-08-28 14:30:30 +02:00
Marion Muszynski
9f2879d800 Merge branch 'ticket-13973-OrderInWaiting' 2017-08-25 15:08:10 +02:00
Marion Muszynski
b46e35c500 indication of order carrier in order list 2017-08-25 10:44:59 +02:00
Marion Muszynski
3ed2d5a51b update pending orders 2017-08-24 10:57:38 +02:00
Marion Muszynski
81189be0f5 small fixes 2017-08-22 18:13:48 +02:00
Marion Muszynski
20d20b4183 modification of mr relay by chosing position in order bo 2017-08-22 17:47:12 +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
Marion Muszynski
1b1e303364 Merge branch 'ticket-13754-fixSalePosition' 2017-07-27 12:07:54 +02:00
Marion Muszynski
bd9ff4fe9e fix position of sale with lock position 2017-07-27 12:07:35 +02:00
root
74b797960e fix legend from prod 2017-07-26 15:34:17 +02:00
Marion Muszynski
3525fdc711 Merge branch 'ticket-13775-PreventHacking' 2017-07-26 11:10:12 +02:00
Marion Muszynski
4acbde0319 add module alerthack to prevent hacker to post 2017-07-26 11:09:47 +02:00
root
e75e1e61bb fix from prod 2017-07-25 16:56:59 +02:00
Marion Muszynski
06338522e6 Merge branch 'ticket-12743-SavSupplier' 2017-07-24 16:56:15 +02:00
Marion Muszynski
e1663b365b fixation of sale position 2017-07-20 16:51:19 +02:00
Marion Muszynski
4e0938b32e fix sale position 2017-07-20 11:37:45 +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
55d3cd475f add posibility to change mr address 2017-07-07 12:38:21 +02:00
Marion Muszynski
04ceecce9f Merge branch 'ticket-13521-ExtractProducts' 2017-07-06 16:42:54 +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