Marion Muszynski
|
d0c298f20b
|
caching menu
|
2017-10-31 16:04:36 +01:00 |
|
Marion Muszynski
|
bf636c7617
|
fix skinstatic
|
2017-10-31 14:48:32 +01:00 |
|
Marion Muszynski
|
233559e439
|
fix count nex products
|
2017-10-31 12:44:11 +01:00 |
|
Marion Muszynski
|
d8a4e94113
|
fix filename
|
2017-10-31 12:41:11 +01:00 |
|
Marion Muszynski
|
caf88c2c7e
|
correction of formulae
|
2017-10-31 12:32:41 +01:00 |
|
Michael RICOIS
|
7bd7624200
|
Add sponsor from backoffice
|
2017-10-31 12:24:29 +01:00 |
|
Marion Muszynski
|
a6ebb26af0
|
fix when product not found
|
2017-10-30 15:45:23 +01:00 |
|
Marion Muszynski
|
cd2bf20ae9
|
uncache sale for backoffice
|
2017-10-30 15:11:20 +01:00 |
|
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
|
6f3b5615dc
|
Merge branch 'ticket-12868-WhiteBG'
|
2017-10-30 11:35:14 +01:00 |
|
root
|
690a60f4ad
|
fix from prod for payment modules
|
2017-10-30 11:34:13 +01:00 |
|
Marion Muszynski
|
0f810abd18
|
fix fraud paybox when i is empty
|
2017-10-27 16:19:20 +02:00 |
|
Marion Muszynski
|
b6700ea7ce
|
add module
|
2017-10-27 13:16:02 +02:00 |
|
Michael RICOIS
|
e3c5b8a528
|
Specific with BPR (Point Relais mais Bureau De poste)
|
2017-10-26 17:14:02 +02:00 |
|
Marion Muszynski
|
f64bc5ff1f
|
fix for admin
|
2017-10-25 15:48:01 +02:00 |
|
Marion Muszynski
|
d62919e240
|
uncache future sale
|
2017-10-25 15:37:15 +02:00 |
|
Marion Muszynski
|
35e786058c
|
add mobile off img
|
2017-10-25 15:06:50 +02:00 |
|
Marion Muszynski
|
96a0f240f2
|
Merge branch 'add-CacheRedis'
|
2017-10-25 14:31:25 +02:00 |
|
Marion Muszynski
|
61a00eafbd
|
fix in tpl
|
2017-10-24 18:30:20 +02:00 |
|
Marion Muszynski
|
20ab1d75d9
|
change to update img promo banner
|
2017-10-24 18:24:17 +02:00 |
|
Marion Muszynski
|
85bb191d49
|
fix
|
2017-10-24 16:44:04 +02:00 |
|
Marion Muszynski
|
824b68b169
|
fix cron trace for order state changement
|
2017-10-24 11:03:33 +02:00 |
|
Marion Muszynski
|
ef97bdfc53
|
fix required paths
|
2017-10-24 10:27:38 +02:00 |
|
Marion Muszynski
|
cdf4f68b74
|
change input to select
|
2017-10-23 16:18:37 +02:00 |
|
Marion Muszynski
|
fc08dfd0eb
|
fix delay in admin privatesale
|
2017-10-23 10:10:05 +02:00 |
|
Marion Muszynski
|
3d236965be
|
fix query 2
|
2017-10-19 18:11:19 +02:00 |
|
Marion Muszynski
|
b7960424df
|
fix query
|
2017-10-19 17:16:01 +02:00 |
|
Marion Muszynski
|
63d71c85be
|
not display when order has payment error state
|
2017-10-19 17:13:23 +02:00 |
|
Marion Muszynski
|
430de0c2e4
|
update philea to sync none philea sale after it s ended
|
2017-10-19 15:40:22 +02:00 |
|
root
|
9c97f5ff94
|
fix and translation from prod
|
2017-10-18 12:10:35 +02:00 |
|
Marion Muszynski
|
1dc2a7f6b2
|
fix conflict
|
2017-10-17 16:29:54 +02:00 |
|
Marion Muszynski
|
c028e2a65c
|
beginning of update
|
2017-10-17 16:22:24 +02:00 |
|
Marion Muszynski
|
e09626b751
|
dont save shipping number in order for dropshipping
|
2017-10-11 15:30:45 +02:00 |
|
Marion Muszynski
|
b54fe1d1a0
|
fix translations
|
2017-10-11 15:26:13 +02:00 |
|
Marion Muszynski
|
902de142ed
|
indication of shipping everywhere
|
2017-10-11 13:24:49 +02:00 |
|
Marion Muszynski
|
61865a956c
|
fix style
|
2017-10-04 17:59:51 +02:00 |
|
Marion Muszynski
|
4d5dd0a75d
|
fix front
|
2017-10-04 17:55:35 +02:00 |
|
Marion Muszynski
|
529b36298a
|
refont stat log
|
2017-10-04 16:54:25 +02:00 |
|
Marion Muszynski
|
ab39a55b63
|
change trad
|
2017-10-04 15:36:36 +02:00 |
|
Marion Muszynski
|
f7057346be
|
add creation category in adminprivatesalesale
|
2017-10-04 13:25:32 +02:00 |
|
Marion Muszynski
|
73e88054bd
|
fix when customer is deleted
|
2017-10-04 12:58:54 +02:00 |
|
Marion Muszynski
|
c5db353391
|
fix sale conbination
|
2017-10-02 13:24:15 +02:00 |
|
Marion Muszynski
|
6b2e8deea1
|
fix and addition
|
2017-10-02 12:49:45 +02:00 |
|
Marion Muszynski
|
e12e7616d7
|
fix when is same sale
|
2017-10-02 12:41:00 +02:00 |
|
Marion Muszynski
|
c7a482e1d0
|
minify css and js scripts
|
2017-09-29 15:50:02 +02:00 |
|
Marion Muszynski
|
4af060a724
|
fix
|
2017-09-28 16:50:03 +02:00 |
|
root
|
115b1b5f61
|
fix cron
|
2017-09-28 16:45:54 +02:00 |
|
Marion Muszynski
|
ad291c9f99
|
move mobile imgage upload to adminprivatesalesale
|
2017-09-28 15:38:03 +02:00 |
|
Marion Muszynski
|
7b97517690
|
fix extending save function
|
2017-09-28 10:39:08 +02:00 |
|
Marion Muszynski
|
695cd7740c
|
fix direct payment paypal
|
2017-09-27 16:00:08 +02:00 |
|
Marion Muszynski
|
1caec538ac
|
fix paypal api errors
|
2017-09-27 12:03:07 +02:00 |
|
Marion Muszynski
|
d31496b1fd
|
fix sale name
|
2017-09-26 17:54:36 +02:00 |
|
Marion Muszynski
|
a7e422af97
|
add mail sendind
|
2017-09-26 17:34:21 +02:00 |
|
Michael RICOIS
|
389c34f82e
|
Merge branch 'ticket-14162-returnwithqty'
|
2017-09-26 15:35:10 +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
|
4b985fb501
|
Merge branch 'ticket-13943-ResetBOpassword'
|
2017-09-21 15:40:57 +02:00 |
|
Marion Muszynski
|
2eddfa25b7
|
fix install module
|
2017-09-21 15:37:41 +02:00 |
|
Marion Muszynski
|
31e6272a31
|
add mail for reset password
|
2017-09-21 15:26:55 +02:00 |
|
Marion Muszynski
|
c962994c82
|
Merge branch 'ticket-14161-UncombinableSale'
|
2017-09-20 16:53:52 +02:00 |
|
Marion Muszynski
|
da99ec2597
|
fix lang
|
2017-09-20 16:44:15 +02:00 |
|
Michael RICOIS
|
e694616107
|
Merge remote-tracking branch 'origin/ticket-13149'
|
2017-09-19 11:26:32 +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
|
0f5228f6e8
|
update error mess from add to cart
|
2017-09-18 11:47:26 +02:00 |
|
Marion Muszynski
|
7d297ca19b
|
fix AntAlert checking limits
|
2017-09-18 11:14:40 +02:00 |
|
root
|
9c2cce3d0b
|
fix from prod
|
2017-09-18 11:01:28 +02:00 |
|
Marion Muszynski
|
d8c2c369c9
|
reset password
|
2017-09-18 11:00:12 +02:00 |
|
Marion Muszynski
|
deec098272
|
close wanted sale
|
2017-09-15 10:09:15 +02:00 |
|
Marion Muszynski
|
783d5c55e8
|
add exception to best seller query
|
2017-09-13 10:43:23 +02:00 |
|
root
|
91e4537e41
|
fix and trad from prod
|
2017-09-13 10:28:19 +02:00 |
|
Marion Muszynski
|
965eab38e3
|
coloring background in white
|
2017-09-12 12:08:18 +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 |
|
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
|
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
|
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
|
4015a120f5
|
Merge branch 'ticket-13973-OrderInWaiting'
|
2017-08-28 15:42:38 +02:00 |
|
Marion Muszynski
|
48288ea952
|
fix query
|
2017-08-28 15:40:55 +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
|
eaefb7f8e4
|
printing multi invoices when products from other sale are completely refunded
|
2017-08-24 16:10:22 +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
|
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
|
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
|
979e3b3733
|
fix grammar error
|
2017-08-22 12:33:13 +02:00 |
|
Marion Muszynski
|
ff21d90390
|
change information in admin form
|
2017-08-22 12:29:40 +02:00 |
|
Marion Muszynski
|
2a4c9d9716
|
fix update last sent date
|
2017-08-22 12:25:47 +02:00 |
|
Marion Muszynski
|
ae50abd4d5
|
fix
|
2017-08-22 12:21:39 +02:00 |
|
Marion Muszynski
|
c3e6114948
|
fix param
|
2017-08-22 11:57:21 +02:00 |
|
Marion Muszynski
|
e6830465e0
|
fix
|
2017-08-22 11:43:58 +02:00 |
|
Marion Muszynski
|
fb748dbad6
|
add models
|
2017-08-22 11:35:39 +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
|
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
|
1247fc2492
|
fix css
|
2017-08-17 16:09:33 +02:00 |
|
Marion Muszynski
|
4a5aa5c7c4
|
add discount and mr shipping numbers
|
2017-08-17 15:52:58 +02:00 |
|
Marion Muszynski
|
613ac55478
|
fix sentences
|
2017-08-17 15:26:06 +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
|
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
|
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
|
34b55f8967
|
fix url
|
2017-07-24 11:57:47 +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
|
4bb62e4ee7
|
fix carriers in report query
|
2017-07-21 12:06:48 +02:00 |
|
Marion Muszynski
|
b990aee5f2
|
refont stock log
|
2017-07-21 11:52:28 +02:00 |
|
Marion Muszynski
|
8a1b3793da
|
resort sales after addition of new one
|
2017-07-21 11:17:05 +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
|
05062d558b
|
fix wordwrap
|
2017-07-18 12:12:25 +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
|
0bd93ed4b2
|
add module tracking tag
|
2017-07-18 10:28:05 +02:00 |
|
Marion Muszynski
|
d868d563f5
|
start of tracking tag
|
2017-07-18 09:56:24 +02:00 |
|
Marion Muszynski
|
0479310097
|
add quantity info
|
2017-07-13 17:00:02 +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
|
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
|
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
|
3869781a1f
|
remove trusted badge on mobile
|
2017-07-10 15:03:49 +02:00 |
|
Marion Muszynski
|
deef10a0b2
|
update and fix braderie
|
2017-07-10 14:11:35 +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
|
471b9a77e7
|
add link to download product base
|
2017-07-06 16:42:39 +02:00 |
|
Marion Muszynski
|
2b6528ad72
|
fix module id and name
|
2017-07-05 11:24:53 +02:00 |
|
Marion Muszynski
|
900848524b
|
add hash and time to paybox call
|
2017-07-05 11:18:09 +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 |
|
root
|
c0c836cfe1
|
fix mr fron prod
|
2017-07-04 15:46:45 +02:00 |
|
root
|
c23288a05b
|
push from prod for trad
|
2017-07-04 15:43:19 +02:00 |
|
root
|
383d48726c
|
Merge branch 'master' of gitlab.antadis.net:dev-antadis/bebeboutik
|
2017-07-04 15:32:36 +02:00 |
|
root
|
dd218bb37a
|
push from prod
|
2017-07-04 15:32:17 +02:00 |
|
Marion Muszynski
|
0e9d19a20f
|
Merge branch 'ticket-11985-CarrierSelection'
|
2017-07-04 15:29:42 +02:00 |
|
Marion Muszynski
|
72965b110b
|
add auto carrier selection
|
2017-07-04 15:29:26 +02:00 |
|
Marion Muszynski
|
18da9c8c75
|
change image size
|
2017-07-04 10:57:31 +02:00 |
|
Marion Muszynski
|
d726131b76
|
css modification of similar product
|
2017-07-04 10:46:06 +02:00 |
|
Marion Muszynski
|
cd390c8fb9
|
add promo banner for ps
|
2017-06-28 12:18:03 +02:00 |
|
Marion Muszynski
|
b87d25038f
|
addition of module ant_promobanner
|
2017-06-27 18:22:24 +02:00 |
|
Marion Muszynski
|
407da54291
|
ready for first tests
|
2017-06-27 12:10:10 +02:00 |
|
Marion Muszynski
|
db8e0ffcce
|
addition of selection by ean
|
2017-06-27 10:12:22 +02:00 |
|
Marion Muszynski
|
a2a0385822
|
upgrading of return process
|
2017-06-26 11:52:56 +02:00 |
|
Marion Muszynski
|
2a5e3d861b
|
fix label
|
2017-06-23 12:27:50 +02:00 |
|
Marion Muszynski
|
5f28f49b51
|
modification reason,instruction and comment
|
2017-06-23 12:24:55 +02:00 |
|
Marion Muszynski
|
2b858963a3
|
add comment
|
2017-06-23 10:11:06 +02:00 |
|
Marion Muszynski
|
4572379dfc
|
fix multi paiement and css
|
2017-06-22 16:53:29 +02:00 |
|
Marion Muszynski
|
9f25935902
|
Merge branch 'ticket-13389-3Dsecure'
|
2017-06-22 15:15:04 +02:00 |
|
Marion Muszynski
|
4eb5fded0b
|
start of moving to HMAC system
|
2017-06-22 11:38:36 +02:00 |
|
Marion Muszynski
|
d3e5dc18d0
|
test
|
2017-06-21 16:47:43 +02:00 |
|
Marion Muszynski
|
a3dc8fa981
|
add 3Dsecure
|
2017-06-21 16:37:50 +02:00 |
|
Marion Muszynski
|
03c6b2c8bd
|
modif
|
2017-06-21 15:54:34 +02:00 |
|
Marion Muszynski
|
805d225840
|
ergo changement and cleaning cron
|
2017-06-21 14:44:10 +02:00 |
|
Marion Muszynski
|
12e744b313
|
Merge branch 'ticket-9103-UrlMetaCategory'
|
2017-06-20 09:51:32 +02:00 |
|
Marion Muszynski
|
2237a0df03
|
start of new extract
|
2017-06-19 17:04:16 +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
|
86f576af74
|
remove philea part
|
2017-06-16 14:52:50 +02:00 |
|
Marion Muszynski
|
45d7d61848
|
add philea and futur MR expe to logistic stats
|
2017-06-16 14:20:34 +02:00 |
|
Marion Muszynski
|
b02d84d2f7
|
optimization query categories
|
2017-06-16 11:09:15 +02:00 |
|
Marion Muszynski
|
27b1222817
|
add mutiple invoice generation for one csv
|
2017-06-16 10:59:02 +02:00 |
|
Marion Muszynski
|
6bdea321da
|
fix footer
|
2017-06-15 16:42:13 +02:00 |
|
Marion Muszynski
|
62e0b6a8f1
|
upgrade adminlog for bdc
|
2017-06-14 17:03:25 +02:00 |
|
Marion Muszynski
|
904f9865e7
|
fix price tax on product page add to cart box
|
2017-06-14 10:58:27 +02:00 |
|
Marion Muszynski
|
660c2c51be
|
change discount conditions
|
2017-06-13 16:12:10 +02:00 |
|
Marion Muszynski
|
3a33250608
|
translate link rewrite category/product
|
2017-06-12 14:41:59 +02:00 |
|
Marion Muszynski
|
5f4f10355e
|
Merge branch 'ticket-13222-PhileaStock'
|
2017-06-12 12:15:35 +02:00 |
|
Marion Muszynski
|
eba11aa018
|
fix script to expected stock and add report view to adminPhilea
|
2017-06-12 12:15:15 +02:00 |
|
Marion Muszynski
|
dd909798c3
|
Merge branch 'ticket-13222-PhileaStock'
|
2017-06-12 10:31:23 +02:00 |
|
Marion Muszynski
|
765f5195dd
|
received CRR
|
2017-06-12 10:30:57 +02:00 |
|
Marion Muszynski
|
15edfc59ec
|
fix inte
|
2017-06-09 10:43:57 +02:00 |
|
Marion Muszynski
|
234769d2bf
|
fix refund query for paypal
|
2017-06-09 10:16:53 +02:00 |
|
Marion Muszynski
|
1c1acd47f6
|
fix refund array
|
2017-06-08 17:14:44 +02:00 |
|
Marion Muszynski
|
c33ade1b1c
|
addition of refund description
|
2017-06-08 17:07:36 +02:00 |
|
Marion Muszynski
|
b954a729a4
|
addition of return comment
|
2017-06-08 16:05:19 +02:00 |
|
Marion Muszynski
|
35bcc57509
|
upload fr img for es when only fr sale bg is loaded
|
2017-06-08 11:51:34 +02:00 |
|
Marion Muszynski
|
0fc01207fc
|
Merge branch 'ticket-13166-ReturnProcess'
|
2017-06-07 15:30:50 +02:00 |
|
Marion Muszynski
|
98ddbdd50f
|
add possibility to resend all order products
|
2017-06-07 15:30:36 +02:00 |
|
Marion Muszynski
|
3f19e5c5cd
|
Merge branch 'ticket-13166-ReturnProcess'
|
2017-06-07 15:07:34 +02:00 |
|
Marion Muszynski
|
bed6683539
|
fix and add shipping number list in order
|
2017-06-07 15:07:19 +02:00 |
|
Marion Muszynski
|
6b8b75c74d
|
Merge branch 'ticket-13166-ReturnProcess'
|
2017-06-07 12:01:34 +02:00 |
|
Marion Muszynski
|
e5266e5bbf
|
fix missing functions and color return product
|
2017-06-07 12:01:15 +02:00 |
|
Marion Muszynski
|
1646e22344
|
addition of script for expected stock
|
2017-06-07 10:21:15 +02:00 |
|
Marion Muszynski
|
b9e1f91c85
|
Merge branch 'ticket-13166-ReturnProcess'
|
2017-06-06 12:19:54 +02:00 |
|
Marion Muszynski
|
06054727e0
|
reverse order of returns
|
2017-06-06 12:19:05 +02:00 |
|
Marion Muszynski
|
c5f4008314
|
Merge branch 'ticket-13166-ReturnProcess'
|
2017-06-06 12:00:59 +02:00 |
|
Marion Muszynski
|
be7863e514
|
fix instructions and reasons
|
2017-06-06 11:57:55 +02:00 |
|
Marion Muszynski
|
043cfee852
|
fix cookie close bug on mobile
|
2017-06-02 15:19:06 +02:00 |
|
Marion Muszynski
|
3d6388f298
|
fixes
|
2017-06-02 11:20:27 +02:00 |
|
Marion Muszynski
|
efa31b77fa
|
fix
|
2017-06-02 11:16:25 +02:00 |
|
Marion Muszynski
|
ec41497ea4
|
ended return after resending
|
2017-06-02 11:14:25 +02:00 |
|
Marion Muszynski
|
d97e11d79c
|
change logo and fix colissimo choice in carrier step
|
2017-06-01 12:26:41 +02:00 |
|
Marion Muszynski
|
b615e9eadb
|
addition of order return history
|
2017-05-31 16:58:27 +02:00 |
|
Marion Muszynski
|
66dea81ece
|
addition of label generation to resend parcel
|
2017-05-29 16:17:54 +02:00 |
|
root
|
f2e1d87de9
|
fix payment paybox with new error code from prod
|
2017-05-24 12:04:47 +02:00 |
|
Marion Muszynski
|
36b9b16d8a
|
fix when we want to export by date
|
2017-05-23 11:32:01 +02:00 |
|
Marion Muszynski
|
9625e2eb9e
|
continuing
|
2017-05-18 13:02:35 +02:00 |
|
Marion Muszynski
|
ef732eb1c5
|
start of resend parcel part
|
2017-05-17 17:24:47 +02:00 |
|
Marion Muszynski
|
0cd37b3fe8
|
Merge branch 'Ticket-10648-MobileModif'
|
2017-05-17 16:51:18 +02:00 |
|
Marion Muszynski
|
a13fe6f2ad
|
fix
|
2017-05-17 16:51:05 +02:00 |
|
Marion Muszynski
|
fd1a80a401
|
Merge branch 'Ticket-10648-MobileModif'
|
2017-05-17 16:48:24 +02:00 |
|
Marion Muszynski
|
ff124b514a
|
fix bg in lp
|
2017-05-17 16:48:11 +02:00 |
|
Marion Muszynski
|
633b163638
|
fix gclid in redirection
|
2017-05-17 16:04:42 +02:00 |
|
Marion Muszynski
|
57fc9bff52
|
add log to follow direct payments
|
2017-05-17 11:32:39 +02:00 |
|
Marion Muszynski
|
931eea448a
|
fix order date
|
2017-05-15 14:44:31 +02:00 |
|
Marion Muszynski
|
65c8eea146
|
load last conv even if it s not about the order
|
2017-05-15 14:42:30 +02:00 |
|
Marion Muszynski
|
7aa63553b4
|
continuing and fix
|
2017-05-15 13:57:37 +02:00 |
|
Marion Muszynski
|
214082433c
|
fix size table
|
2017-05-12 15:00:20 +02:00 |
|
Marion Muszynski
|
ddd066a662
|
continuing with refund part
|
2017-05-12 14:57:13 +02:00 |
|
root
|
c5a3c5af91
|
fix from prod on a cron
|
2017-05-12 12:18:24 +02:00 |
|
Marion Muszynski
|
e46f547c53
|
fix cron_discount and add cron to reorder braderi
|
2017-05-12 12:04:28 +02:00 |
|
Marion Muszynski
|
9180ded3e1
|
continuing refunding part
|
2017-05-12 11:12:07 +02:00 |
|
Marion Muszynski
|
5ff5c296f5
|
contuning
|
2017-05-11 17:43:23 +02:00 |
|
Marion Muszynski
|
ae78a0b870
|
continuing
|
2017-05-11 15:48:43 +02:00 |
|
Marion Muszynski
|
825cd9f8b1
|
fix search by order
|
2017-05-11 12:54:15 +02:00 |
|