Michael RICOIS
|
92d5474a66
|
Merge branch 'ticket-14698-sensefuel' into develop
|
2017-11-22 12:54:21 +01:00 |
|
Michael RICOIS
|
364d14e73c
|
Change display condition
|
2017-11-22 12:37:10 +01:00 |
|
Michael RICOIS
|
0685f70903
|
Merge branch 'ticket-14698-sensefuel' into develop
Conflicts:
themes/site/css/style.css
themes/site_mobile/css/style.css
|
2017-11-22 11:29:11 +01:00 |
|
Michael RICOIS
|
195f3cc346
|
Employee could see all posts active and inactive
|
2017-11-22 11:07:46 +01:00 |
|
Michael RICOIS
|
235f1add37
|
Parent Category
|
2017-11-21 17:51:10 +01:00 |
|
Michael RICOIS
|
84886b3c93
|
Disable Bestsellers block on page "post"
|
2017-11-21 17:31:56 +01:00 |
|
Michael RICOIS
|
77ae796785
|
Merge branch 'ticket-10393-guide-achat' into develop
|
2017-11-21 16:17:28 +01:00 |
|
Michael RICOIS
|
405708b9bc
|
Fix
|
2017-11-21 16:13:24 +01:00 |
|
Michael RICOIS
|
0e97f87299
|
Hook sensefuel
|
2017-11-21 14:55:52 +01:00 |
|
Marion Muszynski
|
c494ce1880
|
Merge branch 'refonte-adminOrderTpl' into develop
|
2017-11-21 14:28:42 +01:00 |
|
Marion Muszynski
|
f567423f9b
|
Merge branch 'fix-cache-privatesale_family_menu'
|
2017-11-21 14:14:42 +01:00 |
|
Marion Muszynski
|
45eded0dd9
|
Merge branch 'fix-cache-privatesale_family_menu' into develop
|
2017-11-21 14:12:27 +01:00 |
|
Marion Muszynski
|
da6a162fe6
|
fix
|
2017-11-21 14:12:21 +01:00 |
|
Marion Muszynski
|
41e29a2e06
|
Merge branch 'fix-cache-privatesale_family_menu' into develop
|
2017-11-21 14:10:24 +01:00 |
|
Marion Muszynski
|
15108dcd34
|
add cache for bestsellers
|
2017-11-21 14:10:00 +01:00 |
|
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
|
99b6ff6bcb
|
Merge branch 'develop' of git@gitlab.antadis.net:dev-antadis/bebeboutik.git into develop
|
2017-11-21 10:36:29 +01:00 |
|
Michael RICOIS
|
b2abb181fe
|
Merge branch 'ticket-14525-parrain' into develop
|
2017-11-21 10:36:00 +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
|
273544ed4f
|
Merge branch 'fix-cache-privatesale_family_menu' into develop
|
2017-11-21 10:21:33 +01:00 |
|
Marion Muszynski
|
acbc72a32c
|
fix name of key
|
2017-11-21 10:21:19 +01:00 |
|
Michael RICOIS
|
1234f7848d
|
Fix blocklinkmulti
|
2017-11-21 10:00:56 +01:00 |
|
Michael RICOIS
|
8b0a6077da
|
Style
|
2017-11-20 17:35:43 +01:00 |
|
Michael RICOIS
|
abee1a1059
|
Rewrite SQL
|
2017-11-20 17:35:23 +01:00 |
|
Marion Muszynski
|
f6944a411d
|
Merge branch 'fix-cache-privatesale_family_menu' into develop
|
2017-11-20 17:21:33 +01:00 |
|
Marion Muszynski
|
b6283cf4ae
|
fix futur sale query
|
2017-11-20 17:21:20 +01:00 |
|
Marion Muszynski
|
27659bb7b9
|
Merge branch 'fix-cache-privatesale_family_menu' into develop
|
2017-11-20 17:13:13 +01:00 |
|
Marion Muszynski
|
446308d40c
|
cache privatesale menu
|
2017-11-20 17:12:58 +01:00 |
|
Michael RICOIS
|
b996521fcb
|
404
|
2017-11-20 14:54:19 +01:00 |
|
Michael RICOIS
|
d2e5f8b3e8
|
Meta information
|
2017-11-20 14:54:09 +01:00 |
|
Michael RICOIS
|
bebdc61548
|
Remove module id
|
2017-11-20 14:53:33 +01:00 |
|
Michael RICOIS
|
5b8353fa4d
|
Don't display link when empty
|
2017-11-20 14:37:28 +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 |
|
Michael RICOIS
|
1c5205a2a8
|
Admin
|
2017-11-17 11:42:47 +01:00 |
|
Marion Muszynski
|
104890e094
|
Merge branch 'ticket-14436-WP' into develop
|
2017-11-17 11:16:54 +01:00 |
|
Marion Muszynski
|
5a9d780365
|
add 2 columns to excel
|
2017-11-17 11:16:30 +01:00 |
|
Michael RICOIS
|
ea761282f0
|
Style
|
2017-11-16 16:50:01 +01:00 |
|
Michael RICOIS
|
150d86bc96
|
Merge branch 'ticket-14698-sensefuel'
|
2017-11-16 10:50:19 +01:00 |
|
Michael RICOIS
|
e9d927613f
|
Merge branch 'ticket-14698-sensefuel' into develop
|
2017-11-16 10:46:00 +01:00 |
|
Michael RICOIS
|
731857719b
|
Temporary disable sensefuel display
|
2017-11-16 10:32:18 +01:00 |
|
Michael RICOIS
|
68744ae6e0
|
Merge branch 'develop' of git@gitlab.antadis.net:dev-antadis/bebeboutik.git into develop
|
2017-11-15 17:39:37 +01:00 |
|
Michael RICOIS
|
be2fff2665
|
Merge branch 'ticket-14698-sensefuel' into develop
|
2017-11-15 17:36:00 +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
|
6c071a8163
|
Merge branch 'ticket-14747-SaleStats' into develop
|
2017-11-15 13:01:17 +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
|
d2acbed313
|
Merge branch 'ticket-14456-BugBaliseEd' into develop
|
2017-11-15 12:41:22 +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 |
|
Marion Muszynski
|
fde48c205b
|
Merge branch 'feature/api_return_url_paypal' into develop
|
2017-11-15 11:44:31 +01:00 |
|
Michael RICOIS
|
b516aa748b
|
Test Front
|
2017-11-15 11:03:34 +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
|
fe0c0ad177
|
Merge branch 'ticket-14735-NewExpe' into develop
|
2017-11-14 17:09:37 +01:00 |
|
Marion Muszynski
|
83171ab6c2
|
add a new delay
|
2017-11-14 17:09:17 +01:00 |
|
Michael RICOIS
|
49cd82d3df
|
Rewrite
|
2017-11-14 15:48:24 +01:00 |
|
Michael RICOIS
|
f4a99c98b7
|
Merge branch 'ticket-14273-voucher' into develop
Conflicts:
mails/es/account.html
|
2017-11-14 12:18:35 +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 |
|
Michael RICOIS
|
006edad609
|
Breadcrumb
|
2017-11-14 11:25:17 +01:00 |
|
Marion Muszynski
|
fe13931fbc
|
flush sale cache before loading sales
|
2017-11-14 10:28:45 +01:00 |
|
Marion Muszynski
|
c555236e2f
|
Merge branch 'refonte-adminOrderTpl' into develop
|
2017-11-13 17:13:23 +01:00 |
|
Marion Muszynski
|
3a9f7ef77c
|
part 2 of inte
|
2017-11-13 17:13:07 +01:00 |
|
Marion Muszynski
|
0ea19438a0
|
Merge branch 'fix-SaleClass' into develop
|
2017-11-13 15:29:01 +01:00 |
|
Marion Muszynski
|
7bafa646e4
|
getting categories by cache in getProducts
|
2017-11-13 15:28:46 +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
|
ae6cec83f0
|
Merge branch 'ticket-14485-philea_2' into develop
|
2017-11-13 13:00:42 +01:00 |
|
Marion Muszynski
|
edb20ca02e
|
fix ajax adminlogistics
|
2017-11-13 13:00:29 +01:00 |
|
Marion Muszynski
|
a55c33204d
|
Merge branch 'ticket-14485-UpdatePhilea' into develop
|
2017-11-13 12:22:45 +01:00 |
|
Marion Muszynski
|
691b1043e0
|
fix query for philea log
|
2017-11-13 12:22:29 +01:00 |
|
Marion Muszynski
|
cb5e77ad86
|
Merge branch 'ticket-14485-philea_2' into develop
|
2017-11-13 12:21:12 +01:00 |
|
Marion Muszynski
|
0ab3785715
|
fix log in adminLogistics
|
2017-11-13 12:20:58 +01:00 |
|
Marion Muszynski
|
410e281451
|
Merge branch 'ticket-14485-philea_2' into develop
|
2017-11-13 12:12:55 +01:00 |
|
Michael RICOIS
|
fe1dd04cf1
|
Template
|
2017-11-13 12:12:44 +01:00 |
|
Marion Muszynski
|
82902b1fba
|
add philea tracking
|
2017-11-13 12:12:39 +01:00 |
|
Marion Muszynski
|
b22ccef249
|
fix conflict
|
2017-11-13 12:07:59 +01:00 |
|
Marion Muszynski
|
8bf78bf282
|
fix script philea
|
2017-11-13 12:05:56 +01:00 |
|
Michael RICOIS
|
2979dc56a6
|
Change privatesales menu
|
2017-11-10 16:01:49 +01:00 |
|
Michael RICOIS
|
ab97adac66
|
Prepare Front
|
2017-11-10 15:25:44 +01:00 |
|
Michael RICOIS
|
df11669618
|
Prepare Front
|
2017-11-09 15:53:45 +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
|
7b003901a8
|
List sub categories
|
2017-11-08 16:48:18 +01:00 |
|
Michael RICOIS
|
eb4ee2af4a
|
Admin
|
2017-11-08 16:47:54 +01:00 |
|
Michael RICOIS
|
cda38086b5
|
Design
|
2017-11-08 10:35:12 +01:00 |
|
Michael RICOIS
|
d9bd62dba7
|
Merge branch 'ticket-14525-parrain'
|
2017-11-08 09:52:16 +01:00 |
|
Michael RICOIS
|
5b6adf98f0
|
Select content
|
2017-11-08 09:50:45 +01:00 |
|
Michael RICOIS
|
4573467338
|
Admin image storage
|
2017-11-08 09:49:24 +01:00 |
|
Michael RICOIS
|
f15d094753
|
Display image
|
2017-11-08 09:49:09 +01:00 |
|
Michael RICOIS
|
9963cbee23
|
Spaces
|
2017-11-08 09:48:45 +01:00 |
|
Michael RICOIS
|
731d431be1
|
New rewrite rules
|
2017-11-08 09:48:29 +01:00 |
|
Michael RICOIS
|
75c8fe9e6f
|
Merge branch 'ticket-14525-parrain' into develop
|
2017-11-07 12:33:38 +01:00 |
|
Michael RICOIS
|
60e3da5380
|
Traduction
|
2017-11-07 12:33:03 +01:00 |
|
Michael RICOIS
|
6c09de8b18
|
Merge branch 'develop' of git@gitlab.antadis.net:dev-antadis/bebeboutik.git into develop
|
2017-11-07 12:18:12 +01:00 |
|
Michael RICOIS
|
c2c55f1302
|
Merge remote-tracking branch 'origin/ticket-14525-parrain' into develop
|
2017-11-07 12:18:00 +01:00 |
|
Michael RICOIS
|
7dfa4d7cbe
|
Remove replacement
|
2017-11-07 12:17:20 +01:00 |
|
Michael RICOIS
|
3cf9de8772
|
Integrate on front
|
2017-11-07 11:51:19 +01:00 |
|
Marion Muszynski
|
284d7fc187
|
Merge branch 'ticket-14436-WP' into develop
|
2017-11-06 17:44:10 +01:00 |
|
Marion Muszynski
|
b67c3f7300
|
fixe comma
|
2017-11-06 17:44:02 +01:00 |
|
Marion Muszynski
|
7d06b3c212
|
Merge branch 'ticket-14436-WP' into develop
|
2017-11-06 17:41:16 +01:00 |
|
Marion Muszynski
|
62485e0888
|
fix date format
|
2017-11-06 17:41:05 +01:00 |
|
Marion Muszynski
|
7b61800173
|
Merge branch 'ticket-14436-WP' into develop
|
2017-11-06 17:37:05 +01:00 |
|
Marion Muszynski
|
d782b3e157
|
fix format and more
|
2017-11-06 17:36:53 +01:00 |
|
Marion Muszynski
|
9c4b8164e3
|
Merge branch 'ticket-14436-WP' into develop
|
2017-11-06 16:52:06 +01:00 |
|
Marion Muszynski
|
6a95069481
|
search in attributes
|
2017-11-06 16:51:48 +01:00 |
|
Michael RICOIS
|
3eab7df2ef
|
Front integration
|
2017-11-06 10:26:53 +01:00 |
|
Michael RICOIS
|
cc35d92d83
|
Delete
|
2017-11-03 10:51:26 +01:00 |
|
Michael RICOIS
|
2eb955f6d2
|
Change tpl path
|
2017-11-03 10:49:38 +01:00 |
|
Michael RICOIS
|
8269e1b38a
|
Protect directory
|
2017-11-03 10:49:03 +01:00 |
|
Michael RICOIS
|
6adcecc54b
|
Merge branch 'ticket-14525-parrain' into develop
|
2017-11-03 10:29:59 +01:00 |
|
Michael RICOIS
|
b2f2a0309e
|
Merge branch 'ticket-14139-delivery-poste'
|
2017-11-03 10:16:19 +01:00 |
|
Michael RICOIS
|
d777e89f81
|
Enhance module
|
2017-11-03 10:14:28 +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
|
ead1bf052e
|
Merge branch 'Task-Caching_2' into develop
|
2017-10-31 16:04:53 +01:00 |
|
Marion Muszynski
|
d0c298f20b
|
caching menu
|
2017-10-31 16:04:36 +01:00 |
|
Michael RICOIS
|
12086ed19b
|
Merge branch 'ticket-14273-voucher' into develop
|
2017-10-31 14:59:44 +01:00 |
|
Michael RICOIS
|
eed1052304
|
Email translation
|
2017-10-31 14:58:54 +01:00 |
|
Marion Muszynski
|
a5e58e2114
|
Merge branch 'ticket-White_2' into develop
|
2017-10-31 14:48:43 +01:00 |
|
Marion Muszynski
|
bf636c7617
|
fix skinstatic
|
2017-10-31 14:48:32 +01:00 |
|
Marion Muszynski
|
ef54c025ad
|
Merge branch 'ticket-White_2' into develop
|
2017-10-31 13:11:14 +01:00 |
|
Marion Muszynski
|
0a775574f8
|
Merge branch 'ticket-14436-WP' into develop
|
2017-10-31 12:44:27 +01:00 |
|
Marion Muszynski
|
233559e439
|
fix count nex products
|
2017-10-31 12:44:11 +01:00 |
|
Marion Muszynski
|
e72bdef669
|
Merge branch 'ticket-14436-WP' into develop
|
2017-10-31 12:41:21 +01:00 |
|
Marion Muszynski
|
d8a4e94113
|
fix filename
|
2017-10-31 12:41:11 +01:00 |
|
Marion Muszynski
|
f0cc764b16
|
Merge branch 'ticket-14436-WP' into develop
|
2017-10-31 12:32:53 +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
|
2f20adc1e6
|
Merge branch 'ticket-14436-WP' into develop
|
2017-10-30 15:45:42 +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
|
5ea49b53b4
|
Merge branch 'Task-Caching' into develop
|
2017-10-30 14:41:52 +01:00 |
|
Marion Muszynski
|
c25d0551cd
|
remove console log
|
2017-10-30 14:41:37 +01:00 |
|
Marion Muszynski
|
0b78ebc2f3
|
Merge branch 'Task-Caching' into develop
|
2017-10-30 13:42:08 +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
|
b7830f009e
|
Merge branch 'ticket-14309-fixAlreadyPaid' into develop
|
2017-10-30 10:27:59 +01:00 |
|
Marion Muszynski
|
356a2ab034
|
test if cart is already transformed
|
2017-10-30 10:27:20 +01:00 |
|
Marion Muszynski
|
0f810abd18
|
fix fraud paybox when i is empty
|
2017-10-27 16:19:20 +02:00 |
|
Michael RICOIS
|
4af87fd2ec
|
Merge branch 'ticket-14273-voucher' into develop
|
2017-10-27 15:21:23 +02:00 |
|
Michael RICOIS
|
6b15c279b9
|
Date
|
2017-10-27 15:20:43 +02:00 |
|
Michael RICOIS
|
0716c6a878
|
Merge branch 'develop' of git@gitlab.antadis.net:dev-antadis/bebeboutik.git into develop
|
2017-10-27 14:46:59 +02:00 |
|
Michael RICOIS
|
7854985496
|
Merge branch 'ticket-14273-voucher' into develop
|
2017-10-27 14:46:36 +02:00 |
|
Michael RICOIS
|
d193722c18
|
Change date calc
|
2017-10-27 14:45:36 +02:00 |
|
Marion Muszynski
|
c3ea5cd75f
|
Merge branch 'ticket-14436-WP' into develop
|
2017-10-27 13:16:11 +02:00 |
|
Marion Muszynski
|
b6700ea7ce
|
add module
|
2017-10-27 13:16:02 +02:00 |
|
Marion Muszynski
|
aac4da9c0a
|
Merge branch 'ticket-14436-WP' into develop
|
2017-10-27 13:12:23 +02:00 |
|
Michael RICOIS
|
01a0f65cf3
|
Merge remote-tracking branch 'origin/ticket-14273-voucher' into develop
|
2017-10-26 17:25:50 +02:00 |
|
Michael RICOIS
|
4d2469f275
|
Merge remote-tracking branch 'origin/ticket-14139-delivery-poste' into develop
|
2017-10-26 17:24:09 +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
|
2ea53f44ab
|
Merge branch 'fix-namePromoBanner' into develop
|
2017-10-24 18:30:31 +02:00 |
|
Marion Muszynski
|
61a00eafbd
|
fix in tpl
|
2017-10-24 18:30:20 +02:00 |
|
Marion Muszynski
|
53b8a9d4ee
|
fix conflict
|
2017-10-24 18:26:36 +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
|
161673618e
|
Merge branch 'fix-resetpassword-include' into develop
|
2017-10-24 10:27:54 +02:00 |
|
Marion Muszynski
|
ef97bdfc53
|
fix required paths
|
2017-10-24 10:27:38 +02:00 |
|
Marion Muszynski
|
0c8837cfbe
|
Merge branch 'ticket-14485-UpdatePhilea' into develop
|
2017-10-23 16:18:52 +02:00 |
|
Marion Muszynski
|
cdf4f68b74
|
change input to select
|
2017-10-23 16:18:37 +02:00 |
|
Michael RICOIS
|
bbc0573e37
|
Add shippinBack info
|
2017-10-23 11:56:43 +02:00 |
|
Marion Muszynski
|
fc08dfd0eb
|
fix delay in admin privatesale
|
2017-10-23 10:10:05 +02:00 |
|
Marion Muszynski
|
7b78add4b8
|
Merge branch 'ticket-14526-LoyaltyPaymentError' into develop
|
2017-10-19 18:11:33 +02:00 |
|
Marion Muszynski
|
3d236965be
|
fix query 2
|
2017-10-19 18:11:19 +02:00 |
|
Michael RICOIS
|
7d2d8f1f03
|
Add a var when shipping is refund
|
2017-10-19 17:53:46 +02:00 |
|
Marion Muszynski
|
5c7c20a708
|
Merge branch 'ticket-14526-LoyaltyPaymentError' into develop
|
2017-10-19 17:16:13 +02:00 |
|
Marion Muszynski
|
b7960424df
|
fix query
|
2017-10-19 17:16:01 +02:00 |
|
Marion Muszynski
|
df52811ada
|
Merge branch 'ticket-14526-LoyaltyPaymentError' into develop
|
2017-10-19 17:13:41 +02:00 |
|
Marion Muszynski
|
63d71c85be
|
not display when order has payment error state
|
2017-10-19 17:13:23 +02:00 |
|
Marion Muszynski
|
7d7003353c
|
Merge branch 'ticket-14485-UpdatePhilea' into develop
|
2017-10-19 15:40:37 +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
|
e300ed0dfc
|
Merge branch 'ticket-14460-BugReturnProcess' into develop
|
2017-10-11 16:15:14 +02:00 |
|
Marion Muszynski
|
5c27461185
|
Merge branch 'ticket-14285-Dropshipping' into develop
|
2017-10-11 15:31:02 +02:00 |
|
Marion Muszynski
|
e09626b751
|
dont save shipping number in order for dropshipping
|
2017-10-11 15:30:45 +02:00 |
|
Marion Muszynski
|
35848aba51
|
Merge branch 'ticket-14285-Dropshipping' into develop
|
2017-10-11 15:26:30 +02:00 |
|
Marion Muszynski
|
b54fe1d1a0
|
fix translations
|
2017-10-11 15:26:13 +02:00 |
|
Marion Muszynski
|
33e179bb96
|
Merge branch 'ticket-14285-Dropshipping' into develop
|
2017-10-11 13:25:06 +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
|
2a5b0712e9
|
Merge branch 'update-CreationCat' into develop
|
2017-10-04 13:25:50 +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 |
|
Michael RICOIS
|
c48408c2db
|
Add new value to detect full refund
|
2017-10-02 17:00:14 +02:00 |
|
Michael RICOIS
|
fe15bbc6cd
|
New voucher after refund
|
2017-10-02 17:00:13 +02:00 |
|
Marion Muszynski
|
97ec6492c6
|
Merge branch 'ticket-14285-Dropshipping' into develop
|
2017-10-02 13:24:32 +02:00 |
|
Marion Muszynski
|
c5db353391
|
fix sale conbination
|
2017-10-02 13:24:15 +02:00 |
|
Marion Muszynski
|
faff854953
|
Merge branch 'fix-uncombinable' into develop
|
2017-10-02 12:50:22 +02:00 |
|
Marion Muszynski
|
6b2e8deea1
|
fix and addition
|
2017-10-02 12:49:45 +02:00 |
|
Marion Muszynski
|
20b2adc944
|
Merge branch 'fix-uncombinable' into develop
|
2017-10-02 12:41:38 +02:00 |
|
Marion Muszynski
|
e12e7616d7
|
fix when is same sale
|
2017-10-02 12:41:00 +02:00 |
|
Marion Muszynski
|
d5bbf47f10
|
fix conflicts
|
2017-09-29 15:51:41 +02:00 |
|
Marion Muszynski
|
c7a482e1d0
|
minify css and js scripts
|
2017-09-29 15:50:02 +02:00 |
|
Marion Muszynski
|
0462fda92b
|
Merge branch 'ticket-14285-Dropshipping' into develop
|
2017-09-28 16:50:18 +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
|
32ca734375
|
Merge branch 'fix-functions' into develop
|
2017-09-28 10:39:24 +02:00 |
|
Marion Muszynski
|
7b97517690
|
fix extending save function
|
2017-09-28 10:39:08 +02:00 |
|
Marion Muszynski
|
59f5489410
|
Merge branch 'ticket-14301-ErrorApiPaypal' into develop
|
2017-09-27 16:00:24 +02:00 |
|
Marion Muszynski
|
695cd7740c
|
fix direct payment paypal
|
2017-09-27 16:00:08 +02:00 |
|
Marion Muszynski
|
72f4b5f05a
|
fix conflicts
|
2017-09-27 12:04:46 +02:00 |
|
Marion Muszynski
|
1caec538ac
|
fix paypal api errors
|
2017-09-27 12:03:07 +02:00 |
|
Marion Muszynski
|
a1742a806c
|
Merge branch 'ticket-14285-Dropshipping' into develop
|
2017-09-26 17:54:53 +02:00 |
|
Marion Muszynski
|
d31496b1fd
|
fix sale name
|
2017-09-26 17:54:36 +02:00 |
|
Marion Muszynski
|
8f07cd31c6
|
fix conflicts
|
2017-09-26 17:35:31 +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
|
d78b6688fa
|
Merge remote-tracking branch 'origin/ticket-14162-returnwithqty' into develop
|
2017-09-25 18:00:36 +02:00 |
|
Michael RICOIS
|
91e7139f34
|
Manage quantity in return form
|
2017-09-25 17:58:47 +02:00 |
|
Marion Muszynski
|
635e984d67
|
Merge branch 'add-CacheRedis' into develop
|
2017-09-25 12:29:11 +02:00 |
|
Marion Muszynski
|
80c6a3db16
|
Merge branch 'task-ImgMobileCategories' into develop
|
2017-09-25 10:59:58 +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
|
b2d1f7bf90
|
Merge branch 'ticket-13943-ResetBOpassword' into develop
|
2017-09-21 15:37:57 +02:00 |
|
Marion Muszynski
|
2eddfa25b7
|
fix install module
|
2017-09-21 15:37:41 +02:00 |
|
Marion Muszynski
|
2add8ce479
|
Merge branch 'ticket-13943-ResetBOpassword' into develop
|
2017-09-21 15:28:25 +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
|
26ab7a6a5e
|
Merge branch 'ticket-14161-UncombinableSale' into develop
|
2017-09-20 16:44:36 +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
|
8c1c166572
|
Merge branch 'ticket-13149' into develop
|
2017-09-18 17:45:29 +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
|
cf246105b7
|
Merge branch 'ticket-14161-UncombinableSale' into develop
|
2017-09-18 11:47:40 +02:00 |
|
Marion Muszynski
|
0f5228f6e8
|
update error mess from add to cart
|
2017-09-18 11:47:26 +02:00 |
|