root
|
91e4537e41
|
fix and trad from prod
|
2017-09-13 10:28:19 +02:00 |
|
Marion Muszynski
|
51d0a8d3a4
|
Merge branch 'ticket-12868-WhiteBG' into develop
|
2017-09-12 12:08:39 +02:00 |
|
Marion Muszynski
|
965eab38e3
|
coloring background in white
|
2017-09-12 12:08:18 +02:00 |
|
Marion Muszynski
|
ed34173096
|
Merge branch 'ticket-14162-DecliInSAV' into develop
|
2017-09-12 11:26:53 +02:00 |
|
Marion Muszynski
|
d1e1c62245
|
fix https on sale export
|
2017-09-07 11:36:48 +02:00 |
|
Marion Muszynski
|
7b72d11da9
|
start of cacheRedis
|
2017-09-07 11:30:57 +02:00 |
|
Marion Muszynski
|
379bec4ab4
|
Merge branch 'task-imgForMobile' into develop
|
2017-09-01 12:00:07 +02:00 |
|
root
|
61ed06dc22
|
Revert "Revert "fix from prod""
This reverts commit 38a13c74d6.
|
2017-09-01 11:22:11 +02:00 |
|
root
|
38a13c74d6
|
Revert "fix from prod"
This reverts commit cd44650b28.
|
2017-09-01 11:16:02 +02:00 |
|
root
|
cd44650b28
|
fix from prod
|
2017-09-01 11:06:24 +02:00 |
|
Marion Muszynski
|
a40c1d6347
|
Merge branch 'ticket-13225-SpecificDelivery' into develop
|
2017-08-31 15:26:01 +02:00 |
|
Marion Muszynski
|
a362ab1aaf
|
Merge branch 'ticket-13225-SpecificDelivery'
|
2017-08-31 15:25:37 +02:00 |
|
Marion Muszynski
|
76e3fd9334
|
fix philea
|
2017-08-31 15:25:19 +02:00 |
|
Marion Muszynski
|
0fa8432a12
|
Merge branch 'ticket-13156-FilterVP' into develop
|
2017-08-31 15:19:35 +02:00 |
|
Marion Muszynski
|
75853ae3e1
|
fix search query for attributes in category scroll
|
2017-08-31 15:19:19 +02:00 |
|
Marion Muszynski
|
b01136e01f
|
reorder by firstname
|
2017-08-31 12:45:37 +02:00 |
|
Marion Muszynski
|
992321abb8
|
changement stat log
|
2017-08-31 10:49:53 +02:00 |
|
Marion Muszynski
|
fe2616ffbb
|
Merge branch 'ticket-13156-FilterVP' into develop
|
2017-08-29 09:50:54 +02:00 |
|
Marion Muszynski
|
cee909f10b
|
fix name and id of checkbox
|
2017-08-29 09:50:32 +02:00 |
|
Marion Muszynski
|
dcfd8aa511
|
Merge branch 'ticket-13156-FilterVP' into develop
|
2017-08-28 18:09:23 +02:00 |
|
Marion Muszynski
|
9f7da4b63a
|
update filter with all attribute groups of sale
|
2017-08-28 18:08:55 +02:00 |
|
Marion Muszynski
|
4015a120f5
|
Merge branch 'ticket-13973-OrderInWaiting'
|
2017-08-28 15:42:38 +02:00 |
|
Marion Muszynski
|
43dde69003
|
Merge branch 'ticket-13973-OrderInWaiting' into develop
|
2017-08-28 15:41:25 +02:00 |
|
Marion Muszynski
|
48288ea952
|
fix query
|
2017-08-28 15:40:55 +02:00 |
|
Marion Muszynski
|
579306aecc
|
Merge branch 'ticket-13973-OrderInWaiting' into develop
|
2017-08-28 15:38:06 +02:00 |
|
Marion Muszynski
|
b221e2eaf5
|
order by carrier firstly
|
2017-08-28 15:37:48 +02:00 |
|
Marion Muszynski
|
a76dd668fe
|
addition of resetbopassword module
|
2017-08-28 14:30:30 +02:00 |
|
root
|
b9c24cbdbb
|
fixes and trad from prod
|
2017-08-28 11:00:40 +02:00 |
|
Marion Muszynski
|
1d12895602
|
fill prtmis field for mondial relay dpc
|
2017-08-28 10:04:09 +02:00 |
|
Marion Muszynski
|
e4d69066bc
|
Merge branch 'ticket-13974-MultiInvoiceWhenRefunding'
|
2017-08-25 15:50:26 +02:00 |
|
Marion Muszynski
|
a73f5cdf8c
|
Merge branch 'ticket-13974-MultiInvoiceWhenRefunding' into develop
|
2017-08-24 16:10:37 +02:00 |
|
Marion Muszynski
|
eaefb7f8e4
|
printing multi invoices when products from other sale are completely refunded
|
2017-08-24 16:10:22 +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
|
1713b36f29
|
fix
|
2017-08-23 10:58:54 +02:00 |
|
Marion Muszynski
|
fc2caf3df4
|
fix async ajax for dnd
|
2017-08-23 10:52:28 +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
|
f5a5600bba
|
formatting error message
|
2017-08-22 16:21:08 +02:00 |
|
Marion Muszynski
|
a7515c2a36
|
return an error when mr not found
|
2017-08-22 16:19:31 +02:00 |
|
Marion Muszynski
|
95211c3b48
|
Merge branch 'ticket-13983-MailInTransitMR' into develop
|
2017-08-22 14:53:55 +02:00 |
|
Marion Muszynski
|
735739a317
|
send in transit mail for mr expe
|
2017-08-22 14:53:40 +02:00 |
|
Marion Muszynski
|
476c681b72
|
fix error of sentence
|
2017-08-22 12:42:08 +02:00 |
|
Marion Muszynski
|
45a83412e6
|
Merge branch 'ticket-13814-mailAlertUpdate' into develop
|
2017-08-22 12:33:24 +02:00 |
|
Marion Muszynski
|
979e3b3733
|
fix grammar error
|
2017-08-22 12:33:13 +02:00 |
|
Marion Muszynski
|
5d065bae7a
|
Merge branch 'ticket-13814-mailAlertUpdate' into develop
|
2017-08-22 12:29:58 +02:00 |
|
Marion Muszynski
|
ff21d90390
|
change information in admin form
|
2017-08-22 12:29:40 +02:00 |
|
Marion Muszynski
|
c0c99bd7e9
|
Merge branch 'ticket-13814-mailAlertUpdate' into develop
|
2017-08-22 12:26:00 +02:00 |
|
Marion Muszynski
|
2a4c9d9716
|
fix update last sent date
|
2017-08-22 12:25:47 +02:00 |
|
Marion Muszynski
|
ae6ef9393c
|
Merge branch 'ticket-13814-mailAlertUpdate' into develop
|
2017-08-22 12:21:55 +02:00 |
|
Marion Muszynski
|
ae50abd4d5
|
fix
|
2017-08-22 12:21:39 +02:00 |
|
Marion Muszynski
|
b283b18d74
|
Merge branch 'ticket-13814-mailAlertUpdate' into develop
|
2017-08-22 11:57:31 +02:00 |
|
Marion Muszynski
|
c3e6114948
|
fix param
|
2017-08-22 11:57:21 +02:00 |
|
Marion Muszynski
|
4befac4029
|
Merge branch 'ticket-13814-mailAlertUpdate' into develop
|
2017-08-22 11:44:08 +02:00 |
|
Marion Muszynski
|
e6830465e0
|
fix
|
2017-08-22 11:43:58 +02:00 |
|
Marion Muszynski
|
2c541bfd6b
|
Merge branch 'ticket-13814-mailAlertUpdate' into develop
|
2017-08-22 11:35:59 +02:00 |
|
Marion Muszynski
|
fb748dbad6
|
add models
|
2017-08-22 11:35:39 +02:00 |
|
Marion Muszynski
|
15a82bf7f0
|
Merge branch 'ticket-13814-mailAlertUpdate' into develop
|
2017-08-22 11:31:13 +02:00 |
|
Marion Muszynski
|
a4853d9043
|
updating Mail alert module
|
2017-08-22 11:30:56 +02:00 |
|
root
|
a56d8c04e8
|
fix from prod
|
2017-08-22 09:59:32 +02:00 |
|
root
|
76dee4cf4c
|
fix from prod
|
2017-08-21 17:57:02 +02:00 |
|
Marion Muszynski
|
8636efc018
|
fix reprint MR for multi parcel
|
2017-08-21 15:05:19 +02:00 |
|
Marion Muszynski
|
5573d5a98d
|
Merge branch 'ticket-13942-fixDeliveryDelay'
|
2017-08-21 12:26:57 +02:00 |
|
root
|
1efe0a509d
|
fix from prod
|
2017-08-21 12:20:02 +02:00 |
|
Marion Muszynski
|
aca897dd80
|
Merge branch 'ticket-13942-fixDeliveryDelay' into develop
|
2017-08-21 12:06:06 +02:00 |
|
Marion Muszynski
|
deebe9e910
|
fix sale delay
|
2017-08-21 12:05:51 +02:00 |
|
Marion Muszynski
|
f36246257c
|
fix conflict
|
2017-08-21 11:46:25 +02:00 |
|
Marion Muszynski
|
0e84b82114
|
remove company name for MR expe
|
2017-08-21 11:44:27 +02:00 |
|
Marion Muszynski
|
851ff949be
|
Merge branch 'ticket-13225-SpecificDelivery'
|
2017-08-21 10:46:55 +02:00 |
|
Marion Muszynski
|
89f1f6f102
|
Merge branch 'ticket-returnprocess-final' into develop
|
2017-08-17 16:09:42 +02:00 |
|
Marion Muszynski
|
1247fc2492
|
fix css
|
2017-08-17 16:09:33 +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
|
9806fd20de
|
Merge branch 'ticket-13225-SpecificDelivery' into develop
|
2017-08-17 15:26:25 +02:00 |
|
Marion Muszynski
|
613ac55478
|
fix sentences
|
2017-08-17 15:26:06 +02:00 |
|
Marion Muszynski
|
69ece0338f
|
fix conflicts
|
2017-08-17 11:25:24 +02:00 |
|
Marion Muszynski
|
abd8e88343
|
addition of new delivery delay and cleaning of sale combination
|
2017-08-17 11:22:54 +02:00 |
|
Marion Muszynski
|
01ff39e801
|
Merge branch 'ticket-12743-SavSupplierPart2' into develop
|
2017-07-28 12:16:57 +02:00 |
|
Marion Muszynski
|
1412696156
|
addition of solution field for supplier demand
|
2017-07-28 12:16:24 +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 |
|
Marion Muszynski
|
8184784f2e
|
Merge branch 'ticket-13323-AdwordsES' into develop
|
2017-07-26 13:21:38 +02:00 |
|
Marion Muszynski
|
58b3c509b4
|
prevent multi tracking after registration
|
2017-07-26 13:21:18 +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 |
|
root
|
9a723dcbc6
|
fix philea from prod
|
2017-07-25 16:54:35 +02:00 |
|
Marion Muszynski
|
06338522e6
|
Merge branch 'ticket-12743-SavSupplier'
|
2017-07-24 16:56:15 +02:00 |
|
Marion Muszynski
|
67aed06044
|
Merge branch 'ticket-13753-EvolBannerPromo' into develop
|
2017-07-24 11:57:58 +02:00 |
|
Marion Muszynski
|
34b55f8967
|
fix url
|
2017-07-24 11:57:47 +02:00 |
|
Marion Muszynski
|
cf80e281c7
|
Merge branch 'ticket-13753-EvolBannerPromo' into develop
|
2017-07-24 11:50:15 +02:00 |
|
Marion Muszynski
|
61cf5b99de
|
add link to banner
|
2017-07-24 11:49:58 +02:00 |
|
Marion Muszynski
|
e19e7cfae3
|
Merge branch 'ticket-13755-LogStats'
|
2017-07-24 11:07:59 +02:00 |
|
Marion Muszynski
|
a9de174730
|
fix table width
|
2017-07-24 11:07:45 +02:00 |
|
Marion Muszynski
|
7d67a3b42e
|
Merge branch 'ticket-13754-fixSalePosition'
|
2017-07-24 10:21:04 +02:00 |
|
Marion Muszynski
|
fbdc194f1a
|
fix width
|
2017-07-21 12:50:00 +02:00 |
|
Marion Muszynski
|
64f0796b94
|
fix location of data in table
|
2017-07-21 12:47:16 +02:00 |
|
Marion Muszynski
|
0a7cfcfbdf
|
fix round
|
2017-07-21 12:15:01 +02:00 |
|
Marion Muszynski
|
ecd5c91ec4
|
Merge branch 'ticket-13755-LogStats' into develop
|
2017-07-21 12:07:02 +02:00 |
|
Marion Muszynski
|
4bb62e4ee7
|
fix carriers in report query
|
2017-07-21 12:06:48 +02:00 |
|
Marion Muszynski
|
0d916a5d3e
|
Merge branch 'ticket-13755-LogStats' into develop
|
2017-07-21 11:52:45 +02:00 |
|
Marion Muszynski
|
b990aee5f2
|
refont stock log
|
2017-07-21 11:52:28 +02:00 |
|
Marion Muszynski
|
8ebad0868b
|
Merge branch 'ticket-13754-fixSalePosition' into develop
|
2017-07-21 11:17:21 +02:00 |
|
Marion Muszynski
|
8a1b3793da
|
resort sales after addition of new one
|
2017-07-21 11:17:05 +02:00 |
|
Marion Muszynski
|
3042613293
|
Merge branch 'fix-mondialRealy' into develop
|
2017-07-20 16:53:01 +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
|
738757a276
|
fix css MR fancy box
|
2017-07-20 12:05:54 +02:00 |
|
Marion Muszynski
|
4e0938b32e
|
fix sale position
|
2017-07-20 11:37:45 +02:00 |
|
root
|
7be76ed1f1
|
trad from prod
|
2017-07-19 15:56:38 +02:00 |
|
root
|
1a975aea61
|
fix MR from prod
|
2017-07-19 14:34:05 +02:00 |
|
Marion Muszynski
|
ed01b1e22a
|
Merge branch 'ticket-12743-SavSupplier' into develop
|
2017-07-18 12:12:40 +02:00 |
|
Marion Muszynski
|
05062d558b
|
fix wordwrap
|
2017-07-18 12:12:25 +02:00 |
|
Marion Muszynski
|
bd8088a915
|
Merge branch 'ticket-12743-SavSupplier' into develop
|
2017-07-18 12:07:06 +02:00 |
|
Marion Muszynski
|
372fb0b51c
|
add some info
|
2017-07-18 12:06:50 +02:00 |
|
Marion Muszynski
|
3f3b5a0023
|
modif include to require
|
2017-07-18 10:38:23 +02:00 |
|
Marion Muszynski
|
66d37d34c6
|
Merge branch 'ticket-13351-EdTag' into develop
|
2017-07-18 10:28:27 +02:00 |
|
Marion Muszynski
|
0bd93ed4b2
|
add module tracking tag
|
2017-07-18 10:28:05 +02:00 |
|
Marion Muszynski
|
ffd3b8adc4
|
Merge branch 'ticket-13351-EdTag' into develop
|
2017-07-18 10:27:34 +02:00 |
|
Marion Muszynski
|
d868d563f5
|
start of tracking tag
|
2017-07-18 09:56:24 +02:00 |
|
Marion Muszynski
|
3e8e564e4e
|
Merge branch 'ticket-12743-SavSupplier' into develop
|
2017-07-13 17:00:18 +02:00 |
|
Marion Muszynski
|
0479310097
|
add quantity info
|
2017-07-13 17:00:02 +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
|
c94d2c4431
|
fix conflicts
|
2017-07-11 10:04:00 +02:00 |
|
Marion Muszynski
|
3a2438d01d
|
Merge branch 'ticket-trustedBadge'
|
2017-07-10 15:55:40 +02:00 |
|
Marion Muszynski
|
86eafbb1f8
|
Merge branch 'ticket-trustedBadge' into develop
|
2017-07-10 15:55:01 +02:00 |
|
Marion Muszynski
|
ac862f6d92
|
fix trusted badge
|
2017-07-10 15:54:46 +02:00 |
|
Marion Muszynski
|
0ac95d23a5
|
Merge branch 'ticket-13695-BugBraderie'
|
2017-07-10 15:29:57 +02:00 |
|
Marion Muszynski
|
68d240d7ae
|
Merge branch 'ticket-trustedBadge' into develop
|
2017-07-10 15:04:58 +02:00 |
|
Marion Muszynski
|
3869781a1f
|
remove trusted badge on mobile
|
2017-07-10 15:03:49 +02:00 |
|
Marion Muszynski
|
362031dc35
|
Merge branch 'ticket-13695-BugBraderie' into develop
|
2017-07-10 14:11:50 +02:00 |
|
Marion Muszynski
|
deef10a0b2
|
update and fix braderie
|
2017-07-10 14:11:35 +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
|
471b9a77e7
|
add link to download product base
|
2017-07-06 16:42:39 +02:00 |
|
Marion Muszynski
|
e01ae068ca
|
Merge branch 'ticket-13508-HMAC' into develop
|
2017-07-05 11:25:04 +02:00 |
|
Marion Muszynski
|
2b6528ad72
|
fix module id and name
|
2017-07-05 11:24:53 +02:00 |
|
Marion Muszynski
|
73dbe5691f
|
Merge branch 'ticket-13508-HMAC' into develop
|
2017-07-05 11:18:22 +02:00 |
|
Marion Muszynski
|
900848524b
|
add hash and time to paybox call
|
2017-07-05 11:18:09 +02:00 |
|
Marion Muszynski
|
eb39bdc47b
|
fix conflict
|
2017-07-05 11:07:43 +02:00 |
|
Marion Muszynski
|
e3b75ce760
|
fix pbx langue
|
2017-07-05 11:00:45 +02:00 |
|
Marion Muszynski
|
91536bdb4d
|
Merge branch 'ticket11985-invoiceMR'
|
2017-07-04 16:23:26 +02:00 |
|
Marion Muszynski
|
7999a3d8f3
|
fix conflict
|
2017-07-04 16:06:55 +02:00 |
|
Marion Muszynski
|
4435110d9d
|
little fix
|
2017-07-04 16:04:00 +02:00 |
|
root
|
c0c836cfe1
|
fix mr fron prod
|
2017-07-04 15:46:45 +02:00 |
|