David
bcd555d6ef
Merge branch 'ticket-15155-paypal-order-display'
2018-01-16 18:18:48 +01:00
David
8194a1f247
Added transaction information on paypal/paybox orders
2018-01-16 18:07:49 +01:00
Michael RICOIS
96f4237fc7
Override method getCustomerDiscountsto to not display discount with
...
quantities = 0
2018-01-16 15:26:19 +01:00
Michael RICOIS
a762200fc2
Typo
2018-01-16 14:38:21 +01:00
Michael RICOIS
90a09e1ce7
Merge remote-tracking branch 'origin/ticket/r15365-logistic-reshipping'
2018-01-15 16:27:20 +01:00
Michael RICOIS
741b69f733
Bad SQL
2018-01-15 16:27:03 +01:00
Michael RICOIS
35e9afa6d9
Merge remote-tracking branch 'origin/ticket/r15365-logistic-reshipping'
2018-01-15 16:04:15 +01:00
Michael RICOIS
65cec1825d
Set philea as first
2018-01-15 16:03:18 +01:00
Michael RICOIS
6cdeaba17f
CS
2018-01-15 15:45:33 +01:00
Michael RICOIS
e459ed17c3
CS
2018-01-15 15:38:14 +01:00
Michael RICOIS
d063c3ef40
Merge remote-tracking branch 'origin/ticket/r15365-logistic-reshipping'
2018-01-15 14:26:15 +01:00
Michael RICOIS
9afceeca10
Merge branch 'ticket/r15319-multi-voucher'
2018-01-15 10:18:00 +01:00
Michael RICOIS
fd6b00ed78
Merge branch 'ticket/r15296-import'
2018-01-15 10:17:27 +01:00
Michael RICOIS
a018ea7833
Merge remote-tracking branch 'origin/ticket/r15224-balises'
2018-01-15 09:24:39 +01:00
Michael RICOIS
bd363dbd21
Check if id_category_default is set, on all lines
2018-01-12 16:02:19 +01:00
Michael RICOIS
18f7642e3d
remove debug
2018-01-12 15:22:13 +01:00
Michael RICOIS
637fea818f
Set philea when delete
2018-01-12 14:58:02 +01:00
Michael RICOIS
bede86e06b
Add possibilty to re-send order when first is by philea
2018-01-12 12:32:59 +01:00
Michael RICOIS
f32ca94f43
CS
2018-01-12 12:19:23 +01:00
David
7da68f2768
Merge branch 'hotfix-cart-packs'
2018-01-12 11:36:16 +01:00
David
8dfb53c792
Set index on $cart_add_qties
2018-01-12 11:32:53 +01:00
Michael RICOIS
ee7ec89a87
Add mark philea
2018-01-11 16:22:25 +01:00
Michael RICOIS
a66a711598
CS
2018-01-11 14:55:22 +01:00
Michael RICOIS
dbc9d4b8e3
CS
2018-01-11 13:19:25 +01:00
Michael RICOIS
9228227d89
CS
2018-01-11 13:03:54 +01:00
Michael RICOIS
00657ccd4e
z-index on expresscart
2018-01-11 11:10:02 +01:00
Michael RICOIS
8b2476e6a7
Add a select for mobile
2018-01-10 17:55:44 +01:00
Michael RICOIS
391d526942
Merge remote-tracking branch 'origin/ticket/r15314-generate-label'
2018-01-10 15:04:36 +01:00
Michael RICOIS
6dcf2c757e
Add a timestamp to bypass cache
2018-01-10 12:49:28 +01:00
David
b2130305b2
js files need to be downloaded from the same domain.
2018-01-09 18:53:38 +01:00
David
b3fec0e045
Merge remote-tracking branch 'origin/master'
2018-01-09 16:53:23 +01:00
David
3db4b0a411
post merge fix
2018-01-09 16:51:48 +01:00
David
371ad472aa
Merge branch 'ticket-14904-achatexpressmobile'
...
# Conflicts:
# themes/site_mobile/css/style.css
# themes/site_mobile/product-list.tpl
2018-01-09 16:21:17 +01:00
David
225f857725
Merge branch 'ticket-14826-fix-product-title'
2018-01-09 12:26:12 +01:00
Michael RICOIS
191f9a3312
Icon for device in order details
2018-01-09 11:51:26 +01:00
Michael RICOIS
04254c0d83
Fix shipping cost for category 8744158
2018-01-09 10:05:53 +01:00
David
6006429bea
Missing translations ES / FR
2018-01-08 17:24:42 +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
584ee64e5a
fixed bug related to cart and translation
2018-01-08 13:12:51 +01:00
Michael RICOIS
2e2ac976a0
Add profile 13 (managers)
2018-01-08 12:47:09 +01:00
David
9694bb685b
Fixed style position
2018-01-08 11:39:05 +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
