Michael RICOIS
|
0597685e56
|
Remove debug
|
2017-11-21 11:14:16 +01:00 |
|
Michael RICOIS
|
3a058c3096
|
Merge branch 'ticket-14525-parrain'
|
2017-11-21 10:37:22 +01:00 |
|
Michael RICOIS
|
e580048c80
|
Fix condition to update properly sponsor with order or not
|
2017-11-21 10:35:23 +01:00 |
|
Michael RICOIS
|
6f35329b24
|
Force adding categories (product_type)
|
2017-11-21 10:23:53 +01:00 |
|
Marion Muszynski
|
acbc72a32c
|
fix name of key
|
2017-11-21 10:21:19 +01:00 |
|
Marion Muszynski
|
b6283cf4ae
|
fix futur sale query
|
2017-11-20 17:21:20 +01:00 |
|
Marion Muszynski
|
446308d40c
|
cache privatesale menu
|
2017-11-20 17:12:58 +01:00 |
|
Michael RICOIS
|
89cfe1499d
|
Intégration sensuel, barre de recherche et modification infomrations
login
|
2017-11-20 11:18:23 +01:00 |
|
Marion Muszynski
|
60b061fc47
|
continuation
|
2017-11-20 11:11:18 +01:00 |
|
Marion Muszynski
|
5a9d780365
|
add 2 columns to excel
|
2017-11-17 11:16:30 +01:00 |
|
Michael RICOIS
|
150d86bc96
|
Merge branch 'ticket-14698-sensefuel'
|
2017-11-16 10:50:19 +01:00 |
|
Michael RICOIS
|
731857719b
|
Temporary disable sensefuel display
|
2017-11-16 10:32:18 +01:00 |
|
Michael RICOIS
|
7ef207a6e3
|
Add README
|
2017-11-15 17:32:14 +01:00 |
|
Michael RICOIS
|
98f7319989
|
Intégration sensefuel
|
2017-11-15 17:31:44 +01:00 |
|
Michael RICOIS
|
5e678c403a
|
Remove xml
|
2017-11-15 16:36:16 +01:00 |
|
Marion Muszynski
|
9bf6364b8a
|
add supplier ref for sale stats BDC part
|
2017-11-15 13:01:03 +01:00 |
|
Michael RICOIS
|
71899c1dfb
|
Original SenseFuel module
|
2017-11-15 12:47:01 +01:00 |
|
Marion Muszynski
|
1aaea6641b
|
fix for ed from es version
|
2017-11-15 12:41:02 +01:00 |
|
Marion Muszynski
|
9b9b88610c
|
Merge branch 'feature/api_return_url_paypal' into 'master'
Adding param to return paypal url instead of redirecting user
See merge request dev-antadis/bebeboutik!5
|
2017-11-15 11:48:10 +01:00 |
|
root
|
43a085d4ec
|
push from prod
|
2017-11-15 10:34:51 +01:00 |
|
Christophe LATOUR
|
83daadd46b
|
Adding param to return paypal url instead of redirecting user
|
2017-11-14 19:50:57 +01:00 |
|
Marion Muszynski
|
83171ab6c2
|
add a new delay
|
2017-11-14 17:09:17 +01:00 |
|
Michael RICOIS
|
6485f72d50
|
Change on mail
|
2017-11-14 11:37:30 +01:00 |
|
Michael RICOIS
|
b31f7276a3
|
Email translation
|
2017-11-14 11:37:29 +01:00 |
|
Michael RICOIS
|
9bd77a8b05
|
Date
|
2017-11-14 11:37:29 +01:00 |
|
Michael RICOIS
|
0fa2474ca5
|
Change date calc
|
2017-11-14 11:37:28 +01:00 |
|
Michael RICOIS
|
a606071d81
|
Add shippinBack info
|
2017-11-14 11:37:27 +01:00 |
|
Michael RICOIS
|
a6942a1356
|
Add a var when shipping is refund
|
2017-11-14 11:37:27 +01:00 |
|
Michael RICOIS
|
e6d8f9a70d
|
Add new value to detect full refund
|
2017-11-14 11:37:26 +01:00 |
|
Michael RICOIS
|
facd10a417
|
New voucher after refund
|
2017-11-14 11:37:26 +01:00 |
|
Marion Muszynski
|
fe13931fbc
|
flush sale cache before loading sales
|
2017-11-14 10:28:45 +01:00 |
|
Marion Muszynski
|
3a9f7ef77c
|
part 2 of inte
|
2017-11-13 17:13:07 +01:00 |
|
Marion Muszynski
|
1fcc90846e
|
Merge branch 'ticket-14485-UpdatePhilea'
|
2017-11-13 13:10:54 +01:00 |
|
Marion Muszynski
|
527b648246
|
add dropshipping parcel checking
|
2017-11-13 13:10:38 +01:00 |
|
Marion Muszynski
|
282a64d6d7
|
fix conflicts
|
2017-11-13 13:03:56 +01:00 |
|
Marion Muszynski
|
edb20ca02e
|
fix ajax adminlogistics
|
2017-11-13 13:00:29 +01:00 |
|
Marion Muszynski
|
691b1043e0
|
fix query for philea log
|
2017-11-13 12:22:29 +01:00 |
|
Marion Muszynski
|
0ab3785715
|
fix log in adminLogistics
|
2017-11-13 12:20:58 +01:00 |
|
Marion Muszynski
|
82902b1fba
|
add philea tracking
|
2017-11-13 12:12:39 +01:00 |
|
Marion Muszynski
|
8bf78bf282
|
fix script philea
|
2017-11-13 12:05:56 +01:00 |
|
Marion Muszynski
|
c208067f4e
|
Merge branch 'ticket-14436-WP'
|
2017-11-09 14:52:52 +01:00 |
|
Marion Muszynski
|
6330105f81
|
big inte of adminOrder view
|
2017-11-09 14:51:48 +01:00 |
|
Michael RICOIS
|
d9bd62dba7
|
Merge branch 'ticket-14525-parrain'
|
2017-11-08 09:52:16 +01:00 |
|
Michael RICOIS
|
60e3da5380
|
Traduction
|
2017-11-07 12:33:03 +01:00 |
|
Michael RICOIS
|
7dfa4d7cbe
|
Remove replacement
|
2017-11-07 12:17:20 +01:00 |
|
Marion Muszynski
|
b67c3f7300
|
fixe comma
|
2017-11-06 17:44:02 +01:00 |
|
Marion Muszynski
|
62485e0888
|
fix date format
|
2017-11-06 17:41:05 +01:00 |
|
Marion Muszynski
|
d782b3e157
|
fix format and more
|
2017-11-06 17:36:53 +01:00 |
|
Marion Muszynski
|
6a95069481
|
search in attributes
|
2017-11-06 16:51:48 +01:00 |
|
Michael RICOIS
|
b2f2a0309e
|
Merge branch 'ticket-14139-delivery-poste'
|
2017-11-03 10:16:19 +01:00 |
|
Michael RICOIS
|
f6b3425af3
|
Remove notice
|
2017-10-31 17:37:49 +01:00 |
|
Michael RICOIS
|
bee38c462b
|
Add condition following number of orders
|
2017-10-31 16:45:07 +01:00 |
|
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 |
|