antadis/bebeboutik
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
1,623 Commits 124 Branches 0 Tags 108 MiB
c9dd7475bc
Commit Graph

124 Commits

Author SHA1 Message Date
Marion Muszynski
8a0b80e15e pop error cart 2016-06-28 14:45:48 +02:00
Marion Muszynski
77b9c22014 fix conflicts 2016-06-22 15:03:36 +02:00
Srv Bebeboutik
e7e7f8381c push prod modif carrier 2016-06-20 10:42:30 +02:00
Dylan Travers
1e674c4adf Add 'X item(s) in stock' from ticket n°9890 2016-06-14 10:40:57 +02:00
Marion Muszynski
30b39b5776 fix conflicts 2016-06-08 10:53:07 +02:00
Marion Muszynski
7ad38029da adding filter 2016-06-06 17:27:09 +02:00
Marion Muszynski
b332800b77 new fields in product db 2016-06-06 14:35:07 +02:00
Srv Bebeboutik
7085c1b80a update from prod 2016-06-06 12:35:00 +02:00
Marion Muszynski
72545630a3 fix conflicts 2016-06-06 11:32:25 +02:00
Marion Muszynski
5f932e9bcd opti attribute group deletion 2016-06-03 13:06:03 +02:00
Marion Muszynski
99b35ed57a adding delivery description field for product 2016-06-03 12:07:12 +02:00
Marion Muszynski
332ac320fb modif for prod 2016-06-02 12:19:24 +02:00
Marion Muszynski
d59e49e3ba update scrollbar color and more 2016-06-01 12:43:12 +02:00
Marion Muszynski
3e0ad8592d update link 2016-06-01 11:23:37 +02:00
Marion Muszynski
96ca86fe85 modif error message 2016-06-01 10:57:31 +02:00
Marion Muszynski
d63a2d7d5a addind field to config if delivery of sale is enabled only in fr 2016-05-30 15:42:20 +02:00
Marion Muszynski
eb441d8edf adding autocomplete postcode 2016-05-19 13:13:47 +02:00
Marion Muszynski
03c743985c modif for prod 2016-05-18 11:19:27 +02:00
Marion Muszynski
13b20adb20 modif validate field OrderDetail 2016-05-18 11:17:41 +02:00
Marion Muszynski
97ef053f1f update for prod 2016-05-18 10:33:23 +02:00
Marion Muszynski
796b0af17c modif for update socol address in BO order 2016-05-18 10:30:17 +02:00
Marion Muszynski
adbe272c7b modif for prod 2016-05-17 16:05:20 +02:00
Marion Muszynski
b7f247729f modif tpl carrier et css 2016-05-17 15:56:27 +02:00
Marion Muszynski
881878e994 modif fdp fix in cart 2016-05-17 14:51:12 +02:00
Marion Muszynski
d571de9d0a modif for prod 2016-05-17 14:32:35 +02:00
Marion Muszynski
30410a5fc8 supp des fdp fix pour vente consommable 2016-05-17 14:31:41 +02:00
Marion Muszynski
dbb4656f42 adapte carrier for prod 2016-05-13 14:36:51 +02:00
Marion Muszynski
acc8ded407 adapte carrier for dev 2016-05-13 14:19:35 +02:00
Marion Muszynski
7e7feb5a52 ajust css and opti restrict addresses 2016-05-13 13:31:50 +02:00
Srv Bebeboutik
5a7c3a0241 modif cart 2016-05-13 10:37:05 +02:00
Srv Bebeboutik
3a4f5414d8 fix conflict 2016-05-12 12:12:42 +02:00
Srv Bebeboutik
34b34929ef push la modif de cart 2016-05-12 12:10:50 +02:00
Marion Muszynski
ebdd485182 modif id carrier in cart 2016-05-12 10:18:15 +02:00
Marion Muszynski
f0d183580a modif cart 2016-05-09 18:02:20 +02:00
Marion Muszynski
ffbb3232b9 modif soflex 2016-05-09 17:43:57 +02:00
Thibault UBUNTU
f15662e826 paypal suite 2016-05-02 15:30:12 +02:00
Marion Muszynski
23ede34fec suite modif tpl product 2016-05-02 15:19:54 +02:00
Marion Muszynski
2a160422d9 adding desc more for product 2016-04-27 16:11:19 +02:00
Marion Muszynski
35ee4a1c68 many update of module loyalty 2016-04-21 17:41:04 +02:00
Marion Muszynski
ef33e2cbc7 Merge branch 'ticket-newExtracts' 2016-04-20 16:05:20 +02:00
Marion Muszynski
21f1ada2d1 Merge branch 'ticket-landingpage' 2016-04-20 15:35:16 +02:00
Marion Muszynski
c63769824e add 2 new extracts for deb 2016-04-20 11:37:50 +02:00
Marion Muszynski
d4722a7e81 order in search product 2016-04-14 13:06:06 +02:00
Marion Muszynski
0b0ebcb26f fix conflict consommables 2016-04-12 15:17:45 +02:00
Marion Muszynski
1d26459616 update landing page for connect button 2016-04-08 15:31:40 +02:00
Thibault UBUNTU
552b46347e v0.1 paypal billing 2016-04-06 15:52:14 +02:00
Marion Muszynski
91efe4469e fix conflict adminProduct 2016-04-06 14:46:47 +02:00
Marion Muszynski
f6f481e09a Merge branch 'ticket-9759' into develop 2016-03-29 17:20:55 +02:00
Marion Muszynski
ba8fa44d2f fix hook 2016-03-29 17:20:28 +02:00
Marion Muszynski
9a5cf505da Merge branch 'ticket-9759' into develop 2016-03-29 17:02:21 +02:00
Marion Muszynski
b763543244 adding ant_alert module 2016-03-29 17:01:26 +02:00
Marion Muszynski
26701eeba5 fix conflict 2016-03-23 12:02:14 +01:00
Marion Muszynski
67264249a5 fix quantity and product with attribute 2016-03-23 11:49:34 +01:00
Alexandre Simonet
9240003ba5 Fix 2016-03-21 10:07:35 +01:00
Marion Muszynski
9a3da1848d Merge branch 'ticket-9642' into develop 2016-03-18 15:57:48 +01:00
Marion Muszynski
6feaf9ff28 test carrier cost 2016-03-18 15:57:22 +01:00
Marion Muszynski
3cca940e40 Merge branch 'ticket-9642' into develop 2016-03-17 12:32:16 +01:00
Marion Muszynski
879418dea1 add check carrier in ParentOrderController 2016-03-17 12:31:42 +01:00
Marion Muszynski
3e64a14e8b Merge branch 'ticket-9642' into develop 2016-03-16 15:25:16 +01:00
Marion Muszynski
e152929f34 trim email update 2016-03-11 01:00:52 +01:00
Marion Muszynski
a9b942ecf6 trim email 2016-03-10 18:19:41 +01:00
Thibault UBUNTU
fad3dbe3c5 fix merge master 2016-03-10 10:40:06 +01:00
Srv Bebeboutik
1426efaff2 change gitignore + class product 2016-03-09 16:33:05 +01:00
Thibault UBUNTU
5ee28563f1 block canaries delivery 2016-03-07 15:58:26 +01:00
Marion Muszynski
5bb7d037a9 fix conflit FrontController 2016-02-24 17:39:59 +01:00
Marion Muszynski
bd3c6cb40c merge frontController/config.inc 2016-02-24 17:23:16 +01:00
Marion Muszynski
ce7462c19e labelgenerate 2016-02-24 17:12:23 +01:00
Srv Bebeboutik
fc61e2ed3a fix truc de merdeeeeeeeeeeee 2016-02-24 16:11:24 +01:00
Thibault UBUNTU
4d81184816 fix conflict 2016-02-24 16:03:29 +01:00
Thibault UBUNTU
d39e27d271 fix conflit 2016-02-24 16:02:43 +01:00
Alexandre Simonet
f778675389 sav 2016-02-23 17:33:08 +01:00
Marion Muszynski
58084aa3c7 adding module ant_support et ant_support_form 2016-02-19 15:30:29 +01:00
Srv Bebeboutik
bfcb4e9aa6 add override class cart to display flag 2016-01-27 16:00:05 +01:00
Srv Bebeboutik
340bc7c146 push site 2016-01-04 12:48:08 +01:00