Michael RICOIS
04254c0d83
Fix shipping cost for category 8744158
2018-01-09 10:05:53 +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
411bf136e5
Use font icon
2017-12-18 15:26:56 +01:00
Michael RICOIS
781f0c10d7
CS
2017-12-18 09:44:27 +01:00
Michael RICOIS
343bd39c20
Remove condition on data
2017-12-18 09:44:12 +01:00
Michael RICOIS
654ffe1401
Remove col definition in class
2017-12-18 09:35:02 +01:00
Michael RICOIS
d5b292d911
Use appli col in ps_orders to know if the order is passed on mobile
...
website
2017-12-15 15:52:02 +01:00
Michael RICOIS
055a403a6e
Add mobile flag
2017-12-15 14:35:53 +01:00
Michael RICOIS
4191450e7b
Add flag to see if order is mobile
2017-12-15 13:11:54 +01:00
root
78df0048af
fix from prod
2017-12-07 15:08:30 +01:00
Marion Muszynski
c85e23079b
add png image
2017-12-07 14:46:19 +01:00
Christophe LATOUR
c701ae10b3
Fix 500:
...
- exception 'ErrorException' with message 'Invalid argument supplied for foreach()' in /home/www/bebeboutik.com/www/override/classes/Order.php:208
- Checking if given to getIfSended is an array an is not empty'
2017-12-05 11:56:03 +01:00
Christophe LATOUR
bffd435197
fix 500:
...
[Tue Dec 05 10:30:11.214323 2017] [:error] [pid 8149] [client 176.145.145.87:58320] exception 'ErrorException' with message 'Undefined variable: id_country' in /home/www/bebeboutik.com/www/override/classes/PaymentModule.php:252\nStack trace:\n#0 /home/www/bebeboutik.com/www/override/classes/PaymentModule.php(252): Laravel\Lumen\Application->Laravel\Lumen\Concerns\{closure}(8, 'Undefined varia...', '/home/www/bebeb...', 252, Array)\n#1 /home/www/bebeboutik.com/www/modules/paybox/paybox.php(428): PaymentModule->validateOrder(1772217, 2, 26.9, 'Paybox', '<b>Successful o...', Array, NULL, false, 'c38f95c9a167ab7...')
2017-12-05 10:56:29 +01:00
Michael RICOIS
39d29960de
Merge branch 'ticket-14698-sensefuel'
2017-11-30 14:25:50 +01:00
Michael RICOIS
f0772aa345
Merge branch 'ticket-14805-creditexpiration'
2017-11-29 14:48:19 +01:00
Michael RICOIS
cc26558cae
Mail language
2017-11-29 12:22:58 +01:00
Marion Muszynski
37d038dd27
Merge branch 'ticket-14828-ChangeIdContactDynamically'
2017-11-29 11:17:57 +01:00
Marion Muszynski
50ad39bf5f
Merge branch 'feature/override_object_model' into 'master'
...
Feature/override object model
See merge request dev-antadis/bebeboutik!9
2017-11-27 11:46:14 +01:00
Christophe LATOUR
8ef9b301ca
adding comment
2017-11-24 16:37:42 +01:00
Christophe LATOUR
283457bd5c
Overriding Objectmodel :
...
- replace self with static to be able to override displayFieldName
2017-11-24 16:24:38 +01:00
Marion Muszynski
58a1710ea2
check if order is sended and change id contact accordingly
2017-11-23 15:31:47 +01:00
root
78bd7eb479
fixes from prod
2017-11-23 15:05:07 +01:00
Michael RICOIS
0e97f87299
Hook sensefuel
2017-11-21 14:55:52 +01:00
Marion Muszynski
a9a557adf9
show if order comes from api or website
2017-11-20 11:32:59 +01:00
Michael RICOIS
89cfe1499d
Intégration sensuel, barre de recherche et modification infomrations
...
login
2017-11-20 11:18:23 +01:00
Christophe LATOUR
60b585feaf
Unique cart between web and application
2017-11-17 12:55:17 +01:00
Christophe LATOUR
d24b02706e
Fix secure_key error
2017-11-17 10:47:51 +01:00
Michael RICOIS
98f7319989
Intégration sensefuel
2017-11-15 17:31:44 +01:00
Michael RICOIS
339e5b4b18
Add function to detect request from api
2017-11-13 11:13:45 +01:00
Michael RICOIS
7c2864d4a1
Fix forget check
2017-11-06 12:25:16 +01:00
Marion Muszynski
96a0f240f2
Merge branch 'add-CacheRedis'
2017-10-25 14:31:25 +02:00
root
9c97f5ff94
fix and translation from prod
2017-10-18 12:10:35 +02:00
Marion Muszynski
ff34c7b32e
add mr and dropshipping sended check for invoice
2017-10-12 15:03:08 +02:00
Marion Muszynski
5600a6da36
fix returnable qty
2017-10-11 16:14:59 +02:00
Marion Muszynski
d762e3e613
fix delete thumb image when uploading image cat
2017-10-04 11:06:59 +02:00
Marion Muszynski
cab30809b1
add option to load the good db for redis
2017-09-25 12:24:44 +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
Michael RICOIS
e35c4042ad
Forget Category override
2017-09-18 17:49:08 +02:00
Marion Muszynski
d8c2c369c9
reset password
2017-09-18 11:00:12 +02:00
Marion Muszynski
ff0a9dd73a
fix
2017-09-13 10:48:03 +02:00
Marion Muszynski
783d5c55e8
add exception to best seller query
2017-09-13 10:43:23 +02:00
Marion Muszynski
4435a061e2
add cacheRedis
2017-09-12 11:13:43 +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
a76dd668fe
addition of resetbopassword module
2017-08-28 14:30:30 +02:00
Marion Muszynski
6caf8fbd99
fix
2017-08-25 10:54:46 +02:00
Marion Muszynski
b46e35c500
indication of order carrier in order list
2017-08-25 10:44:59 +02:00
