Michaël Espeche
67e689ff85
Reinit file
2014-06-25 15:25:32 +02:00
Michaël Espeche
b22255e338
Merge branch 'master' of https://github.com/mespeche/thelia
2014-06-25 15:23:52 +02:00
Michaël Espeche
36729343f0
Reinit file
2014-06-25 15:23:23 +02:00
Manuel Raynaud
8464a8e861
Merge pull request #420 from lunika/session
...
Session
2014-05-20 11:36:55 +02:00
Manuel Raynaud
84e28f1ff2
update changelog with new session process
2014-05-20 11:33:00 +02:00
Manuel Raynaud
2ace0796e8
session is now initialize using dispatcher
2014-05-20 09:44:04 +02:00
Manuel Raynaud
ec50b30ff6
Merge pull request #417 from Yochima/yochima-branch
...
set the placedOrder in the createManual function
2014-05-19 11:12:32 +02:00
Guillaume Barral
bcd817f9d9
initialize the order in the $event object in the createManual function.
...
We need to initialize it because we have to use the placedOrder instead
2014-05-19 11:06:19 +02:00
Guillaume Barral
c4be881ab8
add the test of a non null order in the $event object in createManual function
2014-05-19 11:01:19 +02:00
Manuel Raynaud
1a08cabd6e
Merge pull request #413 from roadster31/coupon-types
...
Coupon types
2014-05-19 10:50:53 +02:00
Franck Allimant
d576e62082
Removed uses of Base in core/lib/Thelia/Model
2014-05-19 09:50:18 +02:00
Guillaume Barral
db94749dc0
set the placedOrder in the createManual function
2014-05-19 09:43:42 +02:00
Manuel Raynaud
d153ca04c3
Merge pull request #415 from zzuutt/master
...
Ajout d'une d'une variable en sortie dans la boucle cart
2014-05-19 09:37:40 +02:00
Franck Allimant
b3b16e1fb1
Added vendor block to schema
2014-05-18 20:34:58 +02:00
Franck Allimant
612898d3b3
ENGINE=InnoDB; -> ENGINE=InnoDB CHARACTER SET='utf8';
2014-05-18 20:30:14 +02:00
Franck Allimant
12fb52dc88
Optimisation : 60*60*24 -> 86400
2014-05-18 20:21:23 +02:00
Franck Allimant
ab060486d0
Fixed Thelia\Model\Base uses.
2014-05-18 20:19:48 +02:00
Manuel Raynaud
7ef09069cb
Merge pull request #414 from nicolasleon/master
...
Allow Content Loop to be ordered by created_at date
2014-05-18 19:38:16 +02:00
Nicolas Léon
957140a5b7
Allow sorting by creation date for Content Loop
2014-05-18 13:43:56 +02:00
Nicolas Léon
811186f4aa
Allow sorting by creation date for Content Loop
2014-05-18 13:34:41 +02:00
zzuutt
482302e2b2
Ajout d'une variable de sortie a la boucle cart
...
n'ayant pas trouve le moyen dans le cart de faire afficher la reference de la combinaison au lieu de la reference du produit, je demande si cela est possible de rajouter celle-ci.
La variable '$PRODUCT_SALE_ELEMENTS_REF'
Merci
2014-05-17 23:23:57 +02:00
Franck Allimant
cae0db00eb
Applied Windows version of php-cs script
2014-05-17 12:00:08 +02:00
Franck Allimant
f772a49dcc
Added Windows version of php-cs script
2014-05-17 11:59:53 +02:00
Franck Allimant
a3e1ece3dc
Merge branch 'coupon-types' of https://github.com/roadster31/thelia into coupon-types
2014-05-17 10:58:00 +02:00
Franck Allimant
2c7337d8e0
Applied php-cs-fixer with level psr2
2014-05-17 10:56:29 +02:00
Franck Allimant
ef142ca077
Applied php-cs-fixer
2014-05-17 10:56:28 +02:00
Franck Allimant
f8ccea1899
Added per-user coupon maximum usage count
2014-05-17 10:56:19 +02:00
Franck Allimant
8a6e3b854a
Applied php-cs-fixer with level psr2
2014-05-17 10:49:34 +02:00
Franck Allimant
1bd1977ee7
Applied php-cs-fixer
2014-05-17 10:24:22 +02:00
Franck Allimant
b5cc1b47a3
dded per-user coupon maximum usage
2014-05-17 10:20:26 +02:00
Franck Allimant
9cdac6d50e
Fixes french translation.
2014-05-16 11:12:24 +02:00
Franck Allimant
90947bcda9
Free shipping restricitions based on Countries and Shipping module
2014-05-16 10:30:15 +02:00
Franck Allimant
ffd842cbf6
Added FREE_SHIPPING_FOR_COUNTRIES_LIST and FREE_SHIPPING_FOR_MODULES_LIST
2014-05-16 10:07:25 +02:00
Franck Allimant
f2b93334eb
Free shipping for selected countries and/or shipping methods
2014-05-15 20:27:39 +02:00
Franck Allimant
392abff271
Free shipping for selected countries and/or shipping methods
2014-05-15 20:25:22 +02:00
Franck Allimant
32542efe28
$chosenDeliveryAddress and $chosenInvoiceAddress are now protected
2014-05-15 19:30:30 +02:00
Franck Allimant
268d5a997d
Typo !
2014-05-15 18:59:48 +02:00
Franck Allimant
683664cb07
Added Model\Module::getModuleInstance() method
2014-05-15 16:50:34 +02:00
zzuutt
ac2e3ed172
Update module-tab-content.html
...
Suppression des caracteres en trop x=" et "
2014-05-15 09:09:54 +02:00
Franck Allimant
9c0cc178b4
Added coupon_country and coupon_module tables
2014-05-14 16:35:16 +02:00
Franck Allimant
c0456e1c07
Additional fix for issue #408
2014-05-14 15:45:20 +02:00
Franck Allimant
ae5e88f90c
Created file. Removes some ununsed indexes
2014-05-14 15:33:32 +02:00
Manuel Raynaud
ed7e07e740
Merge pull request #400 from roadster31/coupons-return
...
Coupons return
2014-05-13 08:54:39 +02:00
Franck Allimant
39c9ca1b2b
Updated changelog with coupon conditions
2014-05-12 23:38:51 +02:00
Franck Allimant
112cb8eeb0
Added ForSomeCustomer condition
2014-05-12 23:37:43 +02:00
Manuel Raynaud
33249f0a75
Merge pull request #395 from Yochima/yochima-branch
...
put the module_include "customer_list_header" in the correct place
2014-05-10 23:15:37 +02:00
Franck Allimant
eb0054d21e
Typo
2014-05-10 22:52:19 +02:00
Franck Allimant
ad0aafeb31
Fixex #399
2014-05-10 22:51:20 +02:00
Franck Allimant
07411b95a1
Added more conditions
2014-05-10 12:13:02 +02:00
Franck Allimant
0a4003ae1c
Fixed condition names
2014-05-10 12:12:48 +02:00
