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 |
|
Marion Muszynski
|
eb92c5a16f
|
addition of module Return process
|
2017-05-11 12:36:06 +02:00 |
|
Marion Muszynski
|
d0a1ed8ed1
|
fix query
|
2017-05-10 10:45:28 +02:00 |
|
Marion Muszynski
|
b0e8f7c900
|
fix for mobile
|
2017-05-04 16:49:50 +02:00 |
|
Marion Muszynski
|
dcecac1122
|
fix for invite program
|
2017-05-04 16:35:10 +02:00 |
|
Marion Muszynski
|
fff250224a
|
fix testPaxbox
|
2017-05-04 14:03:15 +02:00 |
|
Marion Muszynski
|
9d27f87e45
|
add test
|
2017-05-04 11:53:47 +02:00 |
|
Marion Muszynski
|
f041619d2a
|
start of addition test in fraud module
|
2017-05-04 11:35:59 +02:00 |
|
Marion
|
082872a04c
|
modification when an order was in status 18
|
2017-05-03 15:43:20 +02:00 |
|
root
|
ece95c4c03
|
fix from prod
|
2017-05-02 14:39:14 +02:00 |
|
Marion Muszynski
|
f2a5d7ba75
|
fix trad
|
2017-05-02 11:30:22 +02:00 |
|
Marion Muszynski
|
0dced8f385
|
redirect to authentication page for mobile navigation
|
2017-05-02 11:03:11 +02:00 |
|
Marion Muszynski
|
de1c8e211e
|
addition of new landing page on home
|
2017-04-28 11:05:12 +02:00 |
|
Marion Muszynski
|
ee0b4e9fe6
|
fix image positions for export vp
|
2017-04-27 11:05:44 +02:00 |
|
Marion Muszynski
|
25cffa3a74
|
addition of statement for preheader and title if its tomorrow news
|
2017-04-27 10:55:06 +02:00 |
|
Marion Muszynski
|
0a3c45ef95
|
addition of flux generation for tomorrow news
|
2017-04-26 15:51:12 +02:00 |
|
Marion Muszynski
|
2641936fae
|
ticket-12948-PrivatesaleNewsletter
|
2017-04-25 15:56:28 +02:00 |
|
Marion Muszynski
|
117053d905
|
fix message error phone BE
|
2017-04-25 15:24:04 +02:00 |
|
Marion Muszynski
|
8d994ebcf7
|
fix be phone soflexibilite
|
2017-04-25 15:16:27 +02:00 |
|
Marion Muszynski
|
8fbeb85cd0
|
fix conflicts
|
2017-04-24 11:28:57 +02:00 |
|
Marion Muszynski
|
11516eca14
|
Merge branch 'ticket-13032'
|
2017-04-24 11:18:27 +02:00 |
|
Marion Muszynski
|
2d5c17ac1e
|
cleaning before merge
|
2017-04-20 10:50:15 +02:00 |
|
Marion Muszynski
|
a7394fdc93
|
fix bug when product is not found from filter options
|
2017-04-20 10:48:53 +02:00 |
|
Marion Muszynski
|
32e7d65395
|
fix block filter on scroll category
|
2017-04-20 09:47:13 +02:00 |
|
Marion Muszynski
|
2bbc6d5fa6
|
addition of carrier filter for active ones
|
2017-04-19 12:36:41 +02:00 |
|
Marion Muszynski
|
7ef211bbf7
|
addition of another if statement to match eans with first 0
|
2017-04-18 17:01:00 +02:00 |
|
Marion Muszynski
|
90dd61b5bb
|
add multilang on category img thumbs
|
2017-04-18 12:48:42 +02:00 |
|
Marion Muszynski
|
32822dbe49
|
fix when order is not valid
|
2017-04-13 14:10:43 +02:00 |
|
Marion Muszynski
|
ada530274e
|
fix
|
2017-04-13 13:58:57 +02:00 |
|
Marion Muszynski
|
e89abbaee2
|
fix flag language
|
2017-04-13 13:51:04 +02:00 |
|
Marion Muszynski
|
841b995299
|
clean admin ps
|
2017-04-13 12:55:09 +02:00 |
|
Marion Muszynski
|
43bb64da79
|
Merge branch 'ticket-12487-HTTPS3'
|
2017-04-12 17:06:18 +02:00 |
|
Marion Muszynski
|
aad99bcea4
|
remove utm
|
2017-04-12 17:05:56 +02:00 |
|
Marion Muszynski
|
8d8c46d7b6
|
fix adminPrivateSaleSales
|
2017-04-12 09:52:43 +02:00 |
|
Marion Muszynski
|
01a8d528e2
|
fix sortable
|
2017-04-11 15:27:46 +02:00 |
|
Marion Muszynski
|
65ea663f75
|
fix conflict
|
2017-04-11 13:06:48 +02:00 |
|
Marion Muszynski
|
83599a72e6
|
fix
|
2017-04-11 12:32:58 +02:00 |
|
Marion Muszynski
|
8f62586369
|
fix conflict
|
2017-04-11 12:08:19 +02:00 |
|
Marion Muszynski
|
d6e3e16a51
|
modif rss flux catalogue
|
2017-04-10 16:33:42 +02:00 |
|
Marion Muszynski
|
400feb54e1
|
modification flux catalogue to https
|
2017-04-10 16:31:20 +02:00 |
|
Marion Muszynski
|
c7facde1f8
|
fix
|
2017-04-07 12:21:21 +02:00 |
|
Marion Muszynski
|
7d9b3dfcd7
|
fix for https
|
2017-04-07 11:47:42 +02:00 |
|
Marion Muszynski
|
20a07e3273
|
Merge branch 'ticket-12754-MailAlert'
|
2017-04-03 14:22:24 +02:00 |
|
Marion Muszynski
|
028fb3b087
|
http to https for newsletter
|
2017-04-03 12:52:49 +02:00 |
|
Marion Muszynski
|
b7f52f26ef
|
addition of mail sending to contact@bebeboutik.com
|
2017-04-03 10:43:38 +02:00 |
|
Marion Muszynski
|
aefba6f752
|
fix mail sending when no discount added
|
2017-03-31 10:05:50 +02:00 |
|
Marion Muszynski
|
21ca232a11
|
addition of order status option in mail alert module
|
2017-03-30 12:10:32 +02:00 |
|
Marion Muszynski
|
dc9ec01fce
|
Merge branch 'fix-bestSellerCache'
|
2017-03-29 11:01:56 +02:00 |
|
Marion Muszynski
|
82a396a094
|
remove presta cache system for bestseller
|
2017-03-29 10:55:52 +02:00 |
|
Marion Muszynski
|
bc8a76bb3d
|
Merge branch 'ticket-12574-RemoveProductFromBlockcart'
|
2017-03-29 10:22:01 +02:00 |
|
Marion Muszynski
|
85ca91ccfc
|
remove presta cache system for similar products
|
2017-03-29 10:07:59 +02:00 |
|
Marion Muszynski
|
d9f183aacb
|
fix add to cart combination id
|
2017-03-28 10:28:57 +02:00 |
|
Marion Muszynski
|
dafc4e16f0
|
fix remove from block cart
|
2017-03-28 10:09:35 +02:00 |
|
Marion Muszynski
|
f886f5c02e
|
fix
|
2017-03-27 18:10:05 +02:00 |
|
Marion Muszynski
|
36147fbf40
|
change to add , in category names
|
2017-03-27 18:03:30 +02:00 |
|
Marion Muszynski
|
11fc4769b6
|
fix fatal
|
2017-03-27 16:05:55 +02:00 |
|
Marion Muszynski
|
49cc2ef838
|
addition clean menu on category creation and updating
|
2017-03-27 13:24:03 +02:00 |
|
Marion Muszynski
|
4e96e4abe9
|
addition of clean menu when ps is created/updated/deleted
|
2017-03-27 13:12:47 +02:00 |
|
Marion Muszynski
|
396444b912
|
Merge branch 'ticket-12487-HTTPS'
|
2017-03-27 11:28:22 +02:00 |
|
Marion Muszynski
|
dde5791b86
|
fix opening on order status updating
|
2017-03-23 15:02:55 +01:00 |
|
Marion Muszynski
|
53946880d9
|
opening to es version
|
2017-03-22 17:00:37 +01:00 |
|
Marion Muszynski
|
647a917f7d
|
fix js id_category change
|
2017-03-21 15:45:45 +01:00 |
|
Marion Muszynski
|
24d1d1fb33
|
fix 2
|
2017-03-21 14:57:26 +01:00 |
|
Marion Muszynski
|
b58b5a4f39
|
fix font-size
|
2017-03-21 14:54:06 +01:00 |
|
Marion Muszynski
|
ac57693101
|
fix css
|
2017-03-21 14:44:39 +01:00 |
|
Marion Muszynski
|
8d08040017
|
addition of delay in sale list
|
2017-03-21 14:39:43 +01:00 |
|
Marion Muszynski
|
e5a329fc18
|
modif flag and fix update position
|
2017-03-21 13:07:20 +01:00 |
|
Marion Muszynski
|
b7e014f924
|
fix https
|
2017-03-21 10:49:56 +01:00 |
|
Marion Muszynski
|
5aae2a217f
|
moving from ps cache to saved data in txt
|
2017-03-21 10:46:54 +01:00 |
|
Marion Muszynski
|
b343fc4666
|
fix ps_url paiement.php paybox
|
2017-03-09 15:11:22 +01:00 |
|
Marion Muszynski
|
0b969badd1
|
fix protocol in paybox module
|
2017-03-09 12:35:04 +01:00 |
|
Marion Muszynski
|
fefd5442ac
|
fix protocol in soflexibilite module
|
2017-03-09 12:17:04 +01:00 |
|
Marion Muszynski
|
85b5bb049d
|
fix console log
|
2017-03-09 11:53:55 +01:00 |
|
Marion Muszynski
|
c73143d5b5
|
fix https in skinStatic module
|
2017-03-09 11:44:41 +01:00 |
|
Marion Muszynski
|
52a3477a1e
|
fix //static
|
2017-03-09 11:07:11 +01:00 |
|
Marion Muszynski
|
1bd2edfe4d
|
other fix getpagelink
|
2017-03-09 11:00:20 +01:00 |
|
Marion Muszynski
|
e9b9f368a1
|
Merge branch 'ticket-12659-PrintEan'
|
2017-03-09 10:36:14 +01:00 |
|
Marion Muszynski
|
bac4ebbbc2
|
modif with addition of product name and attribute name
|
2017-03-09 10:35:56 +01:00 |
|
Marion Muszynski
|
2e6e1d23ec
|
start of changement to full https
|
2017-03-08 16:10:35 +01:00 |
|
Marion Muszynski
|
8fabe0bfa7
|
Merge branch 'ticket-12591-MarketingModifications'
|
2017-03-07 15:54:28 +01:00 |
|
Marion Muszynski
|
179f73f171
|
fix
|
2017-03-07 14:40:09 +01:00 |
|
Marion Muszynski
|
ee271d98c8
|
continuation of updating of market data with addition of remove from cart to GA and addition of name of sale when product is sent to GA
|
2017-03-07 13:25:46 +01:00 |
|
Marion Muszynski
|
28241acf6b
|
add ref and name for print ean management in product BO
|
2017-03-06 17:05:28 +01:00 |
|
Marion Muszynski
|
601e396791
|
Merge branch 'ticket-12692-LabelGenerate'
|
2017-03-06 12:57:59 +01:00 |
|
Marion Muszynski
|
eae3fc73a4
|
last fix for label size
|
2017-03-06 12:57:45 +01:00 |
|
Marion Muszynski
|
b2b75a6fca
|
addition of MR and title/alias fix
|
2017-03-06 12:54:14 +01:00 |
|
Marion Muszynski
|
aba69ee44f
|
move id category after name in file name
|
2017-03-03 12:04:35 +01:00 |
|
Marion Muszynski
|
051b3b965b
|
fix name of sale export file with adding id category
|
2017-03-03 11:52:10 +01:00 |
|
Marion Muszynski
|
a213779459
|
fix size
|
2017-03-02 17:09:58 +01:00 |
|
Marion Muszynski
|
e2aff37345
|
bigger font size for ref and product name
|
2017-03-02 10:32:48 +01:00 |
|
Marion Muszynski
|
1aca7305b8
|
addition possibility to up/down or remove from blockcart list
|
2017-03-01 17:23:45 +01:00 |
|
Marion Muszynski
|
5bcad477aa
|
Merge branch 'ticket-12643-ExportLoyalty'
|
2017-02-28 16:04:10 +01:00 |
|
Marion Muszynski
|
66cce58d00
|
update message info
|
2017-02-28 16:03:58 +01:00 |
|
Marion Muszynski
|
f5ee58457d
|
Merge branch 'ticket-12643-ExportLoyalty'
|
2017-02-28 15:56:45 +01:00 |
|
Marion Muszynski
|
180bccea8d
|
fix request
|
2017-02-28 15:54:54 +01:00 |
|
Marion Muszynski
|
642a447760
|
addition of export loyalty details
|
2017-02-28 12:55:32 +01:00 |
|
Marion Muszynski
|
c17728cdfe
|
Merge branch 'ticket-12563-TrustedBadge'
|
2017-02-27 16:46:39 +01:00 |
|
Marion Muszynski
|
43eb7d308d
|
add observe for new added element
|
2017-02-27 16:45:02 +01:00 |
|
Marion Muszynski
|
f8333322d0
|
fix width of badge
|
2017-02-27 15:48:34 +01:00 |
|
Marion Muszynski
|
1613aa288f
|
fix margin
|
2017-02-27 13:20:46 +01:00 |
|
Marion Muszynski
|
54b5d4b4ba
|
remove var dump
|
2017-02-27 11:15:59 +01:00 |
|