Marion Muszynski
|
99a6cc80e3
|
Merge branch 'add-carrierInOrderList' into develop
|
2017-08-25 10:45:15 +02:00 |
|
Marion Muszynski
|
b46e35c500
|
indication of order carrier in order list
|
2017-08-25 10:44:59 +02:00 |
|
Marion Muszynski
|
2d25c1470a
|
Merge branch 'ticket-13973-OrderInWaiting' into develop
|
2017-08-24 10:57:56 +02:00 |
|
Marion Muszynski
|
3ed2d5a51b
|
update pending orders
|
2017-08-24 10:57:38 +02:00 |
|
Marion Muszynski
|
f4f0f61bca
|
Merge branch 'ticket-13798-ChangeAddressMR' into develop
|
2017-08-22 18:13:59 +02:00 |
|
Marion Muszynski
|
81189be0f5
|
small fixes
|
2017-08-22 18:13:48 +02:00 |
|
Marion Muszynski
|
1466d522d1
|
Merge branch 'ticket-13798-ChangeAddressMR' into develop
|
2017-08-22 17:47:29 +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
|
379efc6600
|
Merge branch 'ticket-13564-giftOnShoppingCart' into develop
|
2017-08-21 11:00:52 +02:00 |
|
Marion Muszynski
|
e4c877bd71
|
precheck gift option in admin invoices
|
2017-08-21 11:00:31 +02:00 |
|
Marion Muszynski
|
a5375c2a3d
|
Merge branch 'ticket-returnprocess-final' into develop
|
2017-08-17 15:53:22 +02:00 |
|
Marion Muszynski
|
4a5aa5c7c4
|
add discount and mr shipping numbers
|
2017-08-17 15:52:58 +02:00 |
|
Marion Muszynski
|
ff96c35eeb
|
Merge branch 'ticket-12743-SavSupplierPart2' into develop
|
2017-07-28 12:37:02 +02:00 |
|
Marion Muszynski
|
e6a7ab447d
|
add name of product in demand in adminOrder
|
2017-07-28 12:36:49 +02:00 |
|
Marion Muszynski
|
01ff39e801
|
Merge branch 'ticket-12743-SavSupplierPart2' into develop
|
2017-07-28 12:16:57 +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
|
8184784f2e
|
Merge branch 'ticket-13323-AdwordsES' into develop
|
2017-07-26 13:21:38 +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
|
6a88e687c0
|
Merge branch 'ticket-13754-fixSalePosition' into develop
|
2017-07-20 16:51:38 +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
|
d7552c5d21
|
Merge branch 'ticket-12743-SavSupplier' into develop
|
2017-07-13 16:46:26 +02:00 |
|
Marion Muszynski
|
4589c86bb5
|
add module ant supplier demand
|
2017-07-13 16:46:11 +02:00 |
|
Marion Muszynski
|
1ce931d256
|
Merge branch 'ticket-13679-AntCustomGroup' into develop
|
2017-07-12 17:14:49 +02:00 |
|
Marion Muszynski
|
adf8bc8185
|
add module custom group
|
2017-07-12 17:14:30 +02:00 |
|
Marion Muszynski
|
827aac76dc
|
Merge branch 'ticket-11985-MRDeliveryAddress' into develop
|
2017-07-07 12:38:40 +02:00 |
|
Marion Muszynski
|
55d3cd475f
|
add posibility to change mr address
|
2017-07-07 12:38:21 +02:00 |
|
Marion Muszynski
|
05c988412b
|
Merge branch 'ticket-13661-mobileReturn' into develop
|
2017-07-07 11:04:07 +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 |
|
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
|
bede4db028
|
Merge branch 'ticket11985-invoiceMR' into develop
|
2017-07-04 15:54:26 +02:00 |
|
Marion Muszynski
|
a38cc1a255
|
remove var dump
|
2017-07-04 15:54:02 +02:00 |
|
Marion Muszynski
|
eef4d0f4b9
|
Merge branch 'ticket-13564-giftOnShoppingCart' into develop
|
2017-07-03 10:15:38 +02:00 |
|
Marion Muszynski
|
c6c5ad32ca
|
fix delete customer
|
2017-06-28 15:00:53 +02:00 |
|
Marion Muszynski
|
bdc241572a
|
Merge branch 'ticket-13560-BannerMobile' into develop
|
2017-06-28 12:18:17 +02:00 |
|
Marion Muszynski
|
cd390c8fb9
|
add promo banner for ps
|
2017-06-28 12:18:03 +02:00 |
|
Marion Muszynski
|
7ef886ba82
|
Merge branch 'ticket-13560-BannerMobile' into develop
|
2017-06-27 18:22:46 +02:00 |
|
Marion Muszynski
|
b87d25038f
|
addition of module ant_promobanner
|
2017-06-27 18:22:24 +02:00 |
|
Marion Muszynski
|
45fbaac030
|
Merge branch 'ticket-13166-RetourProcess_3' into develop
|
2017-06-26 11:53:16 +02:00 |
|