Michael RICOIS
62b7f44ed5
Fix sql
2017-12-06 09:47:15 +01:00
Michael RICOIS
f06460d8f6
Merge branch 'ticket-14805-creditexpiration' into develop
2017-12-06 09:37:30 +01:00
Michael RICOIS
13ce3a7241
Merge branch 'master' of git@gitlab.antadis.net:dev-antadis/bebeboutik.git
2017-12-06 09:36:35 +01:00
Michael RICOIS
b30cfbd7ce
Merge branch 'ticket-14805-creditexpiration'
2017-12-06 09:36:17 +01:00
Michael RICOIS
dc4c4dffc0
Redirect & confirmation
2017-12-05 17:55:53 +01:00
Michael RICOIS
1702e23439
Todo
2017-12-05 16:53:53 +01:00
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
6a994070bd
Merge branch 'fix/500-module-invite' of gitlab.antadis.net:dev-antadis/bebeboutik into develop
2017-12-05 16:21:53 +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
Christophe LATOUR
cded33390c
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:05:54 +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
Michael RICOIS
c8a8838c58
Merge branch 'ticket-14904-achatexpressmobile' into develop
2017-12-04 17:52:56 +01:00
Michael RICOIS
3c19b90657
Arrow image
2017-12-04 17:42:28 +01:00
Michael RICOIS
f77c8a11c8
Fix merge
2017-12-04 17:27:59 +01:00
Michael RICOIS
cddcea6c52
Merge branch 'ticket-14904-achatexpressmobile' into develop
...
Conflicts:
themes/site_mobile/css/style.css
2017-12-04 16:55:31 +01:00
Michael RICOIS
dfe494f757
Merge branch 'ticket-14904-achatexpressmobile' of git@gitlab.antadis.net:dev-antadis/bebeboutik.git into ticket-14904-achatexpressmobile
2017-12-04 16:52:47 +01:00
Michael RICOIS
adc0cbaa84
Achat express
2017-12-04 16:52:19 +01:00
Michael RICOIS
0cb4afffe1
Ignore
2017-12-04 16:52:18 +01:00
Michael RICOIS
0f33b21482
Add link "Achate express"
2017-12-04 16:52:18 +01:00
Michael RICOIS
4af3752e1a
Merge branch 'ticket-14698-sensefuel' into develop
2017-12-04 16:49:39 +01:00
Michael RICOIS
25272361ee
Enhance sensefuel display
2017-12-04 16:49:09 +01:00
Michael RICOIS
9a95d55d06
Achat express
2017-12-04 16:33:16 +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
4b0f5ecb96
Merge branch 'ticket-14698-sensefuel' into develop
2017-12-04 09:54:35 +01:00
Michael RICOIS
030d9c812d
global var
2017-12-04 09:53:55 +01:00
Michael RICOIS
6fbc309c2d
Merge branch 'ticket-14698-sensefuel' into develop
2017-12-04 09:48:47 +01:00
Michael RICOIS
0de40f3283
Open Sensuel to all except ES version
2017-12-04 09:48:14 +01:00
Michael RICOIS
e6f2b05632
Ignore
2017-12-04 09:36:39 +01:00
Michael RICOIS
d01b4a1296
Add link "Achate express"
2017-12-04 09:36:08 +01:00
Michael RICOIS
c970d88e64
Merge branch 'ticket-14974-refundvoucher' into develop
2017-12-01 14:47:23 +01:00
Michael RICOIS
933ba63dd8
Merge branch 'ticket-14698-sensefuel'
2017-12-01 14:29:38 +01:00
Michael RICOIS
29dbeaf402
Merge branch 'ticket-14698-sensefuel' into develop
2017-12-01 14:25:19 +01:00
Michael RICOIS
3f998e6771
Alway enable display
2017-12-01 12:59:51 +01:00
Michael RICOIS
0978716f81
Merge branch 'spam' into develop
2017-12-01 11:48:10 +01:00
