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
David
8dfb53c792
Set index on $cart_add_qties
2018-01-12 11:32:53 +01:00
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
Michael RICOIS
f51bcf62c9
Add hidden field for spam
2017-12-13 11:34:56 +01:00
Michael RICOIS
e5f83c46b4
Add invisible field
2017-12-13 11:29:56 +01:00
Michael RICOIS
3382d89a7e
Get currency ISO
2017-12-12 17:58:23 +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
Marion Muszynski
74ef1e3173
Merge branch 'ticket-14829-FixEmails'
2017-11-27 10:45:22 +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
Marion Muszynski
577323636c
fix email address when letters are missing
2017-11-21 17:38:25 +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
e7af6fd655
limit address characters
2017-10-09 16:00:13 +02:00
Marion Muszynski
73e88054bd
fix when customer is deleted
2017-10-04 12:58:54 +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
Marion Muszynski
c962994c82
Merge branch 'ticket-14161-UncombinableSale'
2017-09-20 16:53:52 +02:00
Michael RICOIS
e35c4042ad
Forget Category override
2017-09-18 17:49:08 +02:00
Marion Muszynski
2c4ff88262
fix
2017-09-18 11:51:23 +02:00
Marion Muszynski
0f5228f6e8
update error mess from add to cart
2017-09-18 11:47:26 +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
Marion Muszynski
7b72d11da9
start of cacheRedis
2017-09-07 11:30:57 +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
Marion Muszynski
a4853d9043
updating Mail alert module
2017-08-22 11:30:56 +02:00
Marion Muszynski
13576c64d8
fix conflicts
2017-08-21 11:04:16 +02:00
Marion Muszynski
851ff949be
Merge branch 'ticket-13225-SpecificDelivery'
2017-08-21 10:46:55 +02:00
Marion Muszynski
a1b13d71cc
add mr shipping number in order detail tpl
2017-08-18 11:18:06 +02:00
Marion Muszynski
abd8e88343
addition of new delivery delay and cleaning of sale combination
2017-08-17 11:22:54 +02:00
Marion Muszynski
889259d031
fix async bug for saving gift message of cart
2017-08-16 11:04:23 +02:00
Marion Muszynski
4acbde0319
add module alerthack to prevent hacker to post
2017-07-26 11:09:47 +02:00
Marion Muszynski
0e5cbb2638
fix cart
2017-07-18 10:18:38 +02:00
Marion Muszynski
1084d47e72
fix validate gift message
2017-07-18 10:06:57 +02:00
Marion Muszynski
adf8bc8185
add module custom group
2017-07-12 17:14:30 +02:00
Marion Muszynski
deef10a0b2
update and fix braderie
2017-07-10 14:11:35 +02:00
Marion Muszynski
d775d69d33
fix mobile back from product
2017-07-07 11:03:51 +02:00
Marion Muszynski
92b2366ed1
fix
2017-07-06 17:30:16 +02:00
Marion Muszynski
13b68d20ae
moving gift message to shopping cart step
2017-06-30 12:57:06 +02:00
Marion Muszynski
cd390c8fb9
add promo banner for ps
2017-06-28 12:18:03 +02:00
Marion Muszynski
86ccf2ef15
check if customer already exists to prevent fb tracking resending for registration
2017-06-19 11:05:46 +02:00
Marion Muszynski
cfe960cfa2
fix logo carrier when it is a dropshipping
2017-06-02 10:21:06 +02:00
root
38827b2287
fix from prod
2017-06-01 17:47:41 +02:00
Marion Muszynski
a04ec97082
fix
2017-06-01 17:44:43 +02:00
Marion Muszynski
d97e11d79c
change logo and fix colissimo choice in carrier step
2017-06-01 12:26:41 +02:00
Marion Muszynski
abe46bae6c
set id_customer to 0 on SAV when customer is removing
2017-06-01 10:53:07 +02:00
Marion Muszynski
e59142f7ce
fix qty returnable for philea
2017-05-24 10:12:15 +02:00
Marion Muszynski
173b417714
fix img vp en sliders
2017-05-02 12:37:11 +02:00
Marion Muszynski
373d0e3864
Merge branch 'ticket-12487-HTTPS3'
2017-04-24 15:28:54 +02:00
Marion Muszynski
463cbb7ebb
replace http to // for every descriptions
2017-04-24 15:28:08 +02:00
Marion Muszynski
3894ee9acd
Merge branch 'ticket-12487-HTTPS3'
2017-04-24 15:21:42 +02:00
Marion Muszynski
d3a23e7f90
add str replace for img in descriptions
2017-04-24 15:20:41 +02:00
Marion Muszynski
90dd61b5bb
add multilang on category img thumbs
2017-04-18 12:48:42 +02:00
Marion Muszynski
d72262dd99
add override employee
2017-04-13 13:01:51 +02:00
Marion Muszynski
8f62586369
fix conflict
2017-04-11 12:08:19 +02:00
Marion Muszynski
89f72c7045
Merge branch 'ticket-12462-returnMR'
2017-04-06 16:24:22 +02:00
Marion Muszynski
2b861808e0
addition of conversation history in customer thread
2017-04-06 16:10:25 +02:00
Marion Muszynski
33cd9f3d08
continuation
2017-03-09 11:37:44 +01:00
Marion Muszynski
f1e3151dac
fix ssl
2017-03-09 10:53:26 +01:00
Marion Muszynski
8051a5e9c2
fix redirect loop
2017-03-08 18:05:04 +01:00
