Franck Allimant
|
fc1061b556
|
Coupon type template framgment may define a couponInputFormSetup JS function
|
2014-06-10 16:01:38 +02:00 |
|
Franck Allimant
|
511bdf0d7c
|
Order total may be calculated with or without discounted items
|
2014-06-10 16:00:46 +02:00 |
|
Franck Allimant
|
39ff464319
|
Order total may be calculated with or without discounted items
|
2014-06-10 15:59:36 +02:00 |
|
Franck Allimant
|
993be2f37a
|
The coupon type is now passed to te template
|
2014-06-10 15:59:02 +02:00 |
|
Franck Allimant
|
296d697e3f
|
Added new coupon types
|
2014-06-10 15:58:28 +02:00 |
|
Franck Allimant
|
f13ec21337
|
Added new coupon types translations
|
2014-06-10 15:58:01 +02:00 |
|
Franck Allimant
|
1916e2a63d
|
Fixed typo.
|
2014-06-10 15:57:33 +02:00 |
|
Franck Allimant
|
f2770c5a2b
|
Fixed typo.
|
2014-06-10 15:56:38 +02:00 |
|
Franck Allimant
|
466f938cd5
|
Added js=1 parameter toi {intl} calls used in javascript strings
|
2014-06-10 15:55:23 +02:00 |
|
Franck Allimant
|
4ab3149bca
|
Changed {navigate to="return_to"} to {navigate to="previous"}
|
2014-06-10 15:54:42 +02:00 |
|
Franck Allimant
|
49411183da
|
Fixed InvalidArgumentException: No module found for code 'default'
|
2014-06-10 15:52:08 +02:00 |
|
Franck Allimant
|
eb23187782
|
replaced ucfirst by underscoreToCamelcase for calculating method name
|
2014-06-05 18:49:40 +02:00 |
|
Franck Allimant
|
1a3cc6896a
|
Changed "return_to" into "previous"
|
2014-06-04 16:14:04 +02:00 |
|
Franck Allimant
|
413df42941
|
Added "js" parameter to intl function for a safe usage in JS string,
|
2014-05-31 16:27:32 +02:00 |
|
Franck Allimant
|
04b5b5e6b5
|
PHP-CS fixer
|
2014-05-31 15:41:51 +02:00 |
|
Franck Allimant
|
37e2f639d7
|
Checked coupon type before trying to get the service.
|
2014-05-30 20:17:41 +02:00 |
|
Franck Allimant
|
a862c59189
|
Fixed coupon input field name
|
2014-05-30 20:12:41 +02:00 |
|
Franck Allimant
|
06307a8c1a
|
Removed no longer useful tests
|
2014-05-30 20:12:23 +02:00 |
|
Franck Allimant
|
d41bbfc9eb
|
Improved and simplified coupon form management
|
2014-05-30 19:58:02 +02:00 |
|
Manuel Raynaud
|
c738361221
|
Merge pull request #445 from zzuutt/master
Correction issue #425
|
2014-05-28 23:42:21 +02:00 |
|
Manuel Raynaud
|
ee6bb052ad
|
Merge pull request #439 from roadster31/coupon-types
Coupon types
|
2014-05-28 15:58:01 +02:00 |
|
Manuel Raynaud
|
70ecac55cc
|
Merge pull request #436 from etienneroudeix/master
add Hong Kong to country list
|
2014-05-28 15:45:15 +02:00 |
|
etienne roudeix
|
507a52a20f
|
Update 2.0.2.sql
|
2014-05-28 14:56:46 +02:00 |
|
etienne roudeix
|
5395c76bf3
|
Update insert.sql
|
2014-05-28 14:56:04 +02:00 |
|
Franck Allimant
|
567fee839c
|
Added RemoveAmountOnCategories coupon type
|
2014-05-28 12:02:56 +02:00 |
|
Franck Allimant
|
23ebb88719
|
Fix #438
|
2014-05-28 12:01:46 +02:00 |
|
Manuel Raynaud
|
6567e19164
|
Merge pull request #437 from lunika/admin
reset modified column after admin connection
|
2014-05-27 17:12:13 +02:00 |
|
Manuel Raynaud
|
087fc6e9bf
|
reset modified column after admin connection
|
2014-05-27 17:09:53 +02:00 |
|
etienne
|
88a7164e96
|
add Hong Kong to country list
|
2014-05-27 15:38:11 +02:00 |
|
Manuel Raynaud
|
99fb562660
|
Merge pull request #435 from Yochima/yochima-branch
add argument id to the order_product loop
|
2014-05-27 08:53:19 +02:00 |
|
Guillaume Barral
|
2587f208c6
|
add argument id to the order_product loop
|
2014-05-27 08:44:49 +02:00 |
|
Manuel Raynaud
|
30f7eec494
|
Merge pull request #433 from lunika/asset
don't catch exception when javscript assets are processed
|
2014-05-26 17:01:43 +02:00 |
|
Manuel Raynaud
|
6eaea72043
|
don't catch exception when javscript assets are processed
|
2014-05-26 11:07:02 +02:00 |
|
Manuel Raynaud
|
f9ec2b39b0
|
Merge pull request #431 from knjeurope/master
Add code source insert
|
2014-05-26 09:16:36 +02:00 |
|
knjeurope
|
58b33a8e05
|
Add code source insert
Add cose source insert with TinyMce
|
2014-05-26 08:36:42 +02:00 |
|
Manuel Raynaud
|
ad469298bc
|
Merge pull request #428 from roadster31/coupon-types
Temporary fix for #427
|
2014-05-23 00:32:26 +02:00 |
|
Franck Allimant
|
e4029c9fdd
|
Temporary fix for #427
|
2014-05-22 23:39:34 +02:00 |
|
zzuutt
|
f8cf0b5692
|
Correction issue #425
le test du status n'etait pas correct
ajout des logs
|
2014-05-22 11:06:43 +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 |
|