Michael RICOIS
4990ceb49d
Fix comment
2017-12-05 16:53:36 +01:00
Marion Muszynski
a8669628ff
Merge branch 'fix/500-module-invite' into 'master'
...
fix errror 500 :
See merge request dev-antadis/bebeboutik!12
2017-12-05 16:26:11 +01:00
Christophe LATOUR
ca3f49ee2c
fix errror 500 :
...
[Tue Dec 05 13:18:40.067061 2017] [:error] [pid 4904] [client 217.64.63.215:41768] exception 'ErrorException' with message 'Undefined variable: invite' in /home/www/bebeboutik.com/www/modules/invite/invite.php:1717
2017-12-05 16:21:34 +01:00
Michael RICOIS
b148cf5428
CS
2017-12-05 15:46:23 +01:00
Michael RICOIS
02848500ce
Add new rules for fraud
2017-12-05 14:32:53 +01:00
Marion Muszynski
75bbd22598
Merge branch 'fix/500-order-getIfSended' into 'master'
...
Fix 500:
See merge request dev-antadis/bebeboutik!11
2017-12-05 12:06:03 +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
Michael RICOIS
8ca1d602ce
Count valid orders delivered
2017-12-05 11:40:49 +01:00
Marion Muszynski
ff78c57149
Merge branch 'fix/500-validate-order' into 'master'
...
fix 500:
See merge request dev-antadis/bebeboutik!10
2017-12-05 11:09:51 +01:00
root
ba128c63f5
fix laposte check order state
2017-12-05 11:09:05 +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
0a323de70a
CS
2017-12-05 10:06:56 +01:00
Michael RICOIS
a35033cdd5
CS
2017-12-05 10:00:20 +01:00
root
d6563489f2
Merge branch 'temp'
2017-12-04 11:43:51 +01:00
root
c29293c7ae
push from prod
2017-12-04 11:27:43 +01:00
Michael RICOIS
38feb4d6f6
Merge branch 'master' of git@gitlab.antadis.net:dev-antadis/bebeboutik.git
2017-12-04 11:13:44 +01:00
Michael RICOIS
208863c779
Merge branch 'ticket-14974-refundvoucher'
2017-12-04 11:13:24 +01:00
Marion Muszynski
049d27980c
Merge branch 'ticket-14485-phileaMultiSingle'
2017-12-04 10:32:53 +01:00
Marion Muszynski
c84c8f7663
Merge branch 'refonte-adminOrderTpl'
2017-12-04 10:25:31 +01:00
Michael RICOIS
f992124ffb
Merge branch 'ticket-14698-sensefuel'
2017-12-04 09:56:17 +01:00
Michael RICOIS
030d9c812d
global var
2017-12-04 09:53:55 +01:00
Michael RICOIS
0de40f3283
Open Sensuel to all except ES version
2017-12-04 09:48:14 +01:00
Michael RICOIS
933ba63dd8
Merge branch 'ticket-14698-sensefuel'
2017-12-01 14:29:38 +01:00
Michael RICOIS
3f998e6771
Alway enable display
2017-12-01 12:59:51 +01:00
Michael RICOIS
983284f372
Fix condition
2017-12-01 11:34:27 +01:00
Michael RICOIS
3c219651b0
Disable access to all email from qq.com
2017-12-01 11:30:20 +01:00
Michael RICOIS
54841d7cfe
Merge branch 'ticket-14698-sensefuel'
2017-11-30 17:08:39 +01:00
Michael RICOIS
b3f6d559f3
Fix product_type
2017-11-30 17:05:34 +01:00
Michael RICOIS
358e9301f0
Test if is cli
2017-11-30 16:18:48 +01:00
Michael RICOIS
0f9d2ec206
Merge branch 'ticket-14698-sensefuel'
2017-11-30 15:30:59 +01:00
Michael RICOIS
8f7b808373
Forget disable by default
2017-11-30 15:29:57 +01:00
Marion Muszynski
4c4960928a
fix for multi only
2017-11-30 14:43:27 +01:00
Michael RICOIS
39d29960de
Merge branch 'ticket-14698-sensefuel'
2017-11-30 14:25:50 +01:00
Michael RICOIS
e54c47815a
Activation/Désactivation sensefuel
2017-11-30 12:28:45 +01:00
Marion Muszynski
7e221662a7
fix
2017-11-30 12:03:19 +01:00
Marion Muszynski
b64e174c07
fix
2017-11-30 12:00:22 +01:00
Marion Muszynski
09b51bac62
fix
2017-11-30 11:48:27 +01:00
Marion Muszynski
8c3e336003
add multi and single sent
2017-11-30 11:46:34 +01:00
Michael RICOIS
4bbf978846
Reminder options
2017-11-30 11:13:11 +01:00
Michael RICOIS
78aefa4f1b
Get discount use in order
2017-11-29 17:22:21 +01:00
Michael RICOIS
2437dd9d04
Merge branch 'ticket-14805-creditexpiration'
2017-11-29 16:30:30 +01:00
Michael RICOIS
67c0de286a
Remove use discount
2017-11-29 16:24:45 +01:00
Michael RICOIS
f0772aa345
Merge branch 'ticket-14805-creditexpiration'
2017-11-29 14:48:19 +01:00
Michael RICOIS
94437d7043
Remove comment
2017-11-29 14:40:23 +01:00
Michael RICOIS
02fc21cd8d
Ready to test
2017-11-29 12:33:11 +01:00
Michael RICOIS
e4fa94dcf8
Protect directory
2017-11-29 12:23:19 +01:00
Michael RICOIS
cc26558cae
Mail language
2017-11-29 12:22:58 +01:00
Michael RICOIS
699ff5d806
Reprise script original
2017-11-29 11:27:44 +01:00
Marion Muszynski
37d038dd27
Merge branch 'ticket-14828-ChangeIdContactDynamically'
2017-11-29 11:17:57 +01:00
Michael RICOIS
580621fc43
cli to send reminder mail
2017-11-29 11:12:32 +01:00
