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
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
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
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
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
3a5c74c325
Merge remote-tracking branch 'origin/ticket/14716-order-mobile'
2017-12-21 16:56:29 +01:00
Michael RICOIS
4ee4994d33
Merge branch 'ticket/r15224-balises' into develop
2017-12-21 16:46:02 +01:00
Michael RICOIS
58d0028c22
Use $_REQUEST to not double
2017-12-21 16:44:50 +01:00
Michael RICOIS
ac36ae8bac
Merge branch 'fix/suspect_with_other_domain' into develop
2017-12-20 14:25:01 +01:00
Michael RICOIS
5eb320c4de
Ajout exclusion
2017-12-20 11:52:56 +01:00
Michael RICOIS
07b607cfc2
Merge remote-tracking branch 'origin/ticket/15014-invite_credits'
2017-12-20 11:04:41 +01:00
Michael RICOIS
3c2e01149c
Merge branch 'ticket/14716-order-mobile' into develop
2017-12-18 15:53:45 +01:00
Michael RICOIS
411bf136e5
Use font icon
2017-12-18 15:26:56 +01:00
Michael RICOIS
829473cb9f
Merge remote-tracking branch 'origin/ticket/r15128-sponsor' into develop
2017-12-18 14:52:07 +01:00
Michael RICOIS
326de6a61f
Review how cookie works
2017-12-18 14:39:57 +01:00
Michael RICOIS
1293f573b6
CS
2017-12-18 12:47:38 +01:00
Michael RICOIS
02ddea5e16
Try to redefine cooki if sponsor has changed
2017-12-18 12:46:16 +01:00
Michael RICOIS
08f522bc36
Debug, CS
2017-12-18 12:08:24 +01:00
Michael RICOIS
fc5991dce9
Delete
2017-12-18 09:49:22 +01:00
Michael RICOIS
ad584e21e0
Merge branch 'ticket-14698-sensefuel'
2017-12-13 17:57:49 +01:00
Michael RICOIS
f939fe0928
Merge branch 'ticket/15116-nous-contacter-display' into develop
2017-12-13 16:20:02 +01:00
Michael RICOIS
6927c87ce0
Fill email2
2017-12-13 11:43:33 +01:00
Michael RICOIS
f51bcf62c9
Add hidden field for spam
2017-12-13 11:34:56 +01:00
Michael RICOIS
12e70b0f98
Merge branch 'fix/canonical' into develop
2017-12-12 17:04:53 +01:00
Michael RICOIS
850a678976
Add ean13 if available and ".html" suffix
2017-12-12 17:04:25 +01:00
Michael RICOIS
8212e3e2db
Merge branch 'ticket/15014-invite_credits' into develop
2017-12-12 15:53:34 +01:00
Michael RICOIS
5cfc1793a0
Translation
2017-12-12 15:52:37 +01:00
Michael RICOIS
6dfd221652
Merge branch 'ticket/15014-invite_credits' into develop
2017-12-12 15:12:49 +01:00
Michael RICOIS
3091c094cd
Translation
2017-12-12 15:12:26 +01:00
Marion Muszynski
0a6a26d716
Merge branch 'ticket-15084-FixReport'
2017-12-12 11:11:22 +01:00
Marion Muszynski
4bcfdbb767
fix order of crp
2017-12-12 11:11:09 +01:00
Michael RICOIS
be6b195f00
Merge branch 'fix/soapclient-500' into develop
2017-12-11 16:28:56 +01:00
Michael RICOIS
5b675cdaa0
Prefer number
2017-12-11 16:28:16 +01:00
Michael RICOIS
851bb2cd1f
Merge branch 'fix/soapclient-500' into develop
2017-12-11 16:19:28 +01:00
Michael RICOIS
a1752d2d68
Config var
2017-12-11 16:18:49 +01:00
