antadis/bebeboutik
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
4,115 Commits 124 Branches 0 Tags 108 MiB
69500d338e
Commit Graph

237 Commits

Author SHA1 Message Date
David
69500d338e Merge branch 'ticket-15155-paypal-order-display' into develop 2018-01-16 18:17:22 +01:00
David
8194a1f247 Added transaction information on paypal/paybox orders 2018-01-16 18:07:49 +01:00
Michael RICOIS
21ac110911 Merge remote-tracking branch 'origin/ticket/r15463-discount-remove-display' into develop 2018-01-16 15:26:58 +01:00
Michael RICOIS
96f4237fc7 Override method getCustomerDiscountsto to not display discount with 
quantities = 0
 2018-01-16 15:26:19 +01:00
David
ab8da26f51 Merge branch 'hotfix-cart-packs' into develop 2018-01-12 11:35:33 +01:00
David
8dfb53c792 Set index on $cart_add_qties 2018-01-12 11:32:53 +01:00
David
0c44a48f99 Merge branch 'fix/domain-issue-ajax-express-cart' into develop 2018-01-09 19:01:58 +01:00
Michael RICOIS
04254c0d83 Fix shipping cost for category 8744158 2018-01-09 10:05:53 +01:00
Michael RICOIS
c09890dea8 Merge branch 'fix/order' into develop 2017-12-22 14:42:49 +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
3c2e01149c Merge branch 'ticket/14716-order-mobile' into develop 2017-12-18 15:53:45 +01:00
Michael RICOIS
411bf136e5 Use font icon 2017-12-18 15:26:56 +01:00
Michael RICOIS
1e14e2b6d1 Merge branch 'ticket/14716-order-mobile' into develop 2017-12-18 09:45:48 +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
08ef1c0733 Merge branch 'ticket/14716-order-mobile' into develop 2017-12-18 09:36:41 +01:00
Michael RICOIS
654ffe1401 Remove col definition in class 2017-12-18 09:35:02 +01:00
Michael RICOIS
3fcceacb79 Merge branch 'ticket/14716-order-mobile' into develop 2017-12-15 15:55:23 +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
Marion Muszynski
62ad2de197 Merge branch 'ticket-15062-confirmAlert' into develop 2017-12-07 16:29:50 +01:00
root
78df0048af fix from prod 2017-12-07 15:08:30 +01:00
Marion Muszynski
b991cfa8fc Merge branch 'ticket-14716-PictoAppliAdminOrders' into develop 2017-12-07 14:46:34 +01:00
Marion Muszynski
c85e23079b add png image 2017-12-07 14:46:19 +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
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
7ffbdcb98d Merge branch 'ticket-14805-creditexpiration' into develop 2017-11-29 12:42: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
e32e879848 Merge remote-tracking branch 'origin/feature/override_object_model' into develop 2017-11-27 11:14:06 +01:00
Christophe LATOUR
8ef9b301ca adding comment 2017-11-24 16:37:42 +01:00
Christophe Latour
f78296570e Merge branch 'feature/override_object_model' of gitlab.antadis.net:dev-antadis/bebeboutik into develop 2017-11-24 16:25:34 +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
a846de99eb Merge branch 'ticket-14828-ChangeIdContactDynamically' into develop 2017-11-23 15:32:07 +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
0685f70903 Merge branch 'ticket-14698-sensefuel' into develop 
Conflicts:
	themes/site/css/style.css
	themes/site_mobile/css/style.css
 2017-11-22 11:29:11 +01:00
Michael RICOIS
77ae796785 Merge branch 'ticket-10393-guide-achat' into develop 2017-11-21 16:17:28 +01:00
Michael RICOIS
0e97f87299 Hook sensefuel 2017-11-21 14:55:52 +01:00
Marion Muszynski
bc60df4a4d Merge branch 'ticket-14716-AppData' into develop 2017-11-20 11:33:18 +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
5a32991da8 Merge branch 'feature/unique_cart_web_and_app' into develop 2017-11-17 12:56:10 +01:00
Christophe LATOUR
60b585feaf Unique cart between web and application 2017-11-17 12:55:17 +01:00