Michael RICOIS
428dd65c8e
Merge branch 'develop' of git@gitlab.antadis.net:dev-antadis/bebeboutik.git into develop
2018-01-09 10:08:57 +01:00
Michael RICOIS
7dfc4db294
Merge remote-tracking branch 'origin/ticket/r15364-fix-shipping-cost' into develop
2018-01-09 10:08:39 +01:00
Michael RICOIS
04254c0d83
Fix shipping cost for category 8744158
2018-01-09 10:05:53 +01:00
David
428fd82c38
Merge branch 'ticket-14904-achatexpressmobile' into develop
2018-01-08 17:27:00 +01:00
David
6006429bea
Missing translations ES / FR
2018-01-08 17:24:42 +01:00
Michael RICOIS
e1e5f7c634
Merge branch 'develop' of git@gitlab.antadis.net:dev-antadis/bebeboutik.git into develop
2018-01-08 17:11:15 +01:00
Michael RICOIS
2b4033a51d
Merge branch 'ticket/r15319-multi-voucher' into develop
2018-01-08 17:08:07 +01:00
Michael RICOIS
a896679d6a
Use number only when we get more than 1 discount
2018-01-08 17:07:30 +01:00
Michael RICOIS
c82df4b134
Manage several discount per order
2018-01-08 17:01:55 +01:00
Michael RICOIS
d9f23e7f30
Merge branch 'ticket/r15314-generate-label'
2018-01-08 16:46:14 +01:00
Michael RICOIS
3dd5712e92
Rollback
2018-01-08 16:45:38 +01:00
Michael RICOIS
a87264db47
Merge branch 'ticket/r15314-generate-label'
2018-01-08 15:06:16 +01:00
David
0a3cad9e8e
Merge remote-tracking branch 'origin/develop' into develop
2018-01-08 13:13:59 +01:00
David
68df3e7e6a
Merge branch 'ticket-14904-achatexpressmobile' into develop
2018-01-08 13:13:22 +01:00
David
584ee64e5a
fixed bug related to cart and translation
2018-01-08 13:12:51 +01:00
Michael RICOIS
b1614b7fda
Merge branch 'ticket/r15351-permissions-managers' into develop
2018-01-08 12:50:18 +01:00
Michael RICOIS
2e2ac976a0
Add profile 13 (managers)
2018-01-08 12:47:09 +01:00
David
c7718cc938
Merge branch 'ticket-14826-fix-product-title' into develop
...
# Conflicts:
# themes/site_mobile/css/style.css
2018-01-08 12:02:00 +01:00
David
9694bb685b
Fixed style position
2018-01-08 11:39:05 +01:00
Michael RICOIS
70b140a03c
Merge branch 'develop' of git@gitlab.antadis.net:dev-antadis/bebeboutik.git into develop
2018-01-05 15:25:44 +01:00
Michael RICOIS
28cf96ba5e
Merge branch 'ticket/r15314-generate-label' into develop
2018-01-05 15:24:37 +01:00
Michael RICOIS
3a217603ed
CS
2018-01-05 15:20:41 +01:00
Michael RICOIS
c16b34b0df
Generate Label even if product have EAN code
2018-01-05 15:14:30 +01:00
David TESTON
9374aeb31c
Merge branch 'fix/mktime' into 'master'
...
FIX 500 :
See merge request dev-antadis/bebeboutik!14
2018-01-04 18:43:30 +01:00
Christophe LATOUR
d80baa79bd
FIX 500 :
...
- exception 'ErrorException' with message 'mktime(): You should be using the time() function instead' in /Library/WebServer/Documents/bebeboutik/modules/privatesales/Sale.php:76
2018-01-04 18:39:01 +01:00
Michael RICOIS
2582a426de
Merge branch 'fix/order_mobile'
2018-01-03 12:13:27 +01:00
David
059d483841
Merge branch 'ticket-14826-fix-product-title' into develop
2018-01-02 12:36:44 +01:00
David
306858b179
css fix
2018-01-02 11:58:33 +01:00
David
c71c1e7712
Merge branch 'ticket-14826-fix-product-title' into develop
...
# Conflicts:
# themes/site_mobile/product-list.tpl
2018-01-02 11:52:06 +01:00
David
4664d8f6fa
attempt at correccting ajax add to cart
2018-01-02 11:51:07 +01:00
Michael RICOIS
7184fccba4
Merge remote-tracking branch 'origin/ticket/r15251-limit_etagere'
2018-01-02 10:47:13 +01:00
Michael RICOIS
ad47f0c1f6
Merge branch 'ticket/r15251-limit_etagere' into develop
2018-01-02 10:30:11 +01:00
Michael RICOIS
07cea80436
Increase "emplacement" limit
2018-01-02 10:28:59 +01:00
David
e84e304c9e
Merge branch 'ticket/r15172-change-adress-socol'
...
# Conflicts:
# adm/tabs/AdminOrders.php
2018-01-02 10:20:01 +01:00
David
2d84b8127e
Merge branch 'ticket-14826-fix-product-title' into develop
...
# Conflicts:
# themes/site_mobile/css/style.css
# themes/site_mobile/product-list.tpl
2017-12-29 18:25:28 +01:00
David
44da8e13b1
Additionnal information will not break the template anymore
2017-12-29 18:22:13 +01:00
David
392bccd110
Merge branch 'ticket/r15172-change-adress-socol' into develop
2017-12-29 18:13:34 +01:00
David
0868abc8ea
no more checking for change
2017-12-29 18:12:55 +01:00
David
657b39d532
Merge branch 'ticket/r15172-change-adress-socol' into develop
...
# Conflicts:
# adm/tabs/AdminOrders.php
2017-12-29 15:55:01 +01:00
David
de0efe93eb
Added modification button display in all conditions.
2017-12-29 15:52:23 +01:00
David
5b2ee8b7aa
Merge branch 'ticket-14826-fix-product-title'
2017-12-29 13:04:30 +01:00
David
5d1065ab7e
Merge branch 'ticket-14826-fix-product-title' into develop
2017-12-29 12:20:39 +01:00
David
b8612b7dfd
product title is longer in async product list
2017-12-29 12:19:17 +01:00
David
fc4f66c0cf
Merge branch 'fix/paybox-dec-2017' into develop
2017-12-22 15:10:00 +01:00
David
f5f52de382
switched emails
2017-12-22 15:08:14 +01:00
Michael RICOIS
c09890dea8
Merge branch 'fix/order' into develop
2017-12-22 14:42:49 +01:00
Michael RICOIS
c75f641567
Fix order on mobile website. appli is not a bool
2017-12-22 14:42:19 +01:00
Michael RICOIS
5acba9c265
Fix order mobile
2017-12-22 12:51:26 +01:00
Michael RICOIS
fe49739aa4
Merge branch 'fix/smartbanner'
2017-12-21 17:00:38 +01:00
Michael RICOIS
3a5c74c325
Merge remote-tracking branch 'origin/ticket/14716-order-mobile'
2017-12-21 16:56:29 +01:00
