Manuel Raynaud
|
fd0dad68d5
|
Merge pull request #485 from roadster31/tinymce
Tinymce module improvement
|
2014-06-19 11:46:37 +02:00 |
|
Franck Allimant
|
0d8f9f3c6e
|
Fixed minor typos
|
2014-06-19 01:51:39 +02:00 |
|
Franck Allimant
|
d66d2b3839
|
PHP-CS fixer pass.
|
2014-06-19 00:33:24 +02:00 |
|
Franck Allimant
|
f842f90e00
|
Merge branch 'master' into tinymce
Conflicts:
local/modules/Tinymce/templates/backOffice/default/include/tinymce_init.tpl
|
2014-06-19 00:16:21 +02:00 |
|
Franck Allimant
|
0d0f04bf29
|
Added getConfiguredShopUrl() to access url_site variable
|
2014-06-18 19:34:43 +02:00 |
|
Franck Allimant
|
ce772b6b60
|
An exception is thrown if a module could not be loaded.
|
2014-06-18 15:36:59 +02:00 |
|
Manuel Raynaud
|
d14a2d24f2
|
fix cs
|
2014-06-18 10:06:10 +02:00 |
|
Manuel Raynaud
|
101197c0de
|
various fixes from insight
|
2014-06-18 09:33:32 +02:00 |
|
Manuel Raynaud
|
588be42e0f
|
Merge pull request #473 from roadster31/coupon-end
Major coupon types refactoring.
|
2014-06-17 21:11:14 +02:00 |
|
Franck Allimant
|
cbf2eae842
|
Written coupons unit tests
|
2014-06-17 19:58:56 +02:00 |
|
Manuel Raynaud
|
f9e0db06c1
|
refactor formatDate function and create test
|
2014-06-17 15:41:47 +02:00 |
|
Franck Allimant
|
6f12882850
|
Added missing $this->setFieldsValue($effects);
|
2014-06-17 15:28:35 +02:00 |
|
Franck Allimant
|
8b74eae911
|
php-cs pass
|
2014-06-17 00:43:10 +02:00 |
|
Franck Allimant
|
c87c6e2793
|
Added free product coupon.
|
2014-06-17 00:38:18 +02:00 |
|
Franck Allimant
|
749487e967
|
Added getDeliveryCountry() method
|
2014-06-17 00:37:53 +02:00 |
|
Franck Allimant
|
f3ccf8ec15
|
Updated translation after finishing coupons
|
2014-06-17 00:36:23 +02:00 |
|
Franck Allimant
|
17ad1ed6fa
|
The CouponManager clear() method is now invoked.
|
2014-06-17 00:35:52 +02:00 |
|
Franck Allimant
|
6b6687c85c
|
Added clear() method
|
2014-06-17 00:35:12 +02:00 |
|
Franck Allimant
|
2edfb0b389
|
Added clear method.
|
2014-06-17 00:34:57 +02:00 |
|
Manuel Raynaud
|
7377af6029
|
Merge pull request #471 from nicolasleon/master
Date formating should be able to cope with locale time format
|
2014-06-15 19:47:22 +02:00 |
|
Nicolas Léon
|
20593a0576
|
Fix PSR coding style
|
2014-06-14 21:58:33 +02:00 |
|
Franck Allimant
|
ee47488cc8
|
getDefaultSaleElements() returns a single ProductSaleElement
|
2014-06-14 17:45:05 +02:00 |
|
Franck Allimant
|
ae6eaefd25
|
Fixed @param and @return annotations
|
2014-06-14 16:10:52 +02:00 |
|
Nicolas Léon
|
7c653d63a6
|
Save and restore the current locale setting
|
2014-06-13 09:54:38 +02:00 |
|
Franck Allimant
|
ec26ebac32
|
php-cs fixer passed.
|
2014-06-12 17:10:38 +02:00 |
|
Franck Allimant
|
e9a0661938
|
Pushed forward the refactoring, using traits
|
2014-06-12 17:00:17 +02:00 |
|
Franck Allimant
|
b34f1c35c7
|
Fixed the checking of maximum coupon usage count
|
2014-06-12 16:42:00 +02:00 |
|
Franck Allimant
|
992100f145
|
Added helper to chek if number of uses is reached
|
2014-06-12 16:40:07 +02:00 |
|
Franck Allimant
|
96ebcf1880
|
Added the COUPON_CLEAR_ALL event, and a route to trigger it.
|
2014-06-12 16:39:27 +02:00 |
|
Franck Allimant
|
95841809c4
|
Refactored coupons to reduce code duplication
|
2014-06-12 13:14:46 +02:00 |
|
Franck Allimant
|
db29505fee
|
Added Attribute value related coupons
|
2014-06-12 13:14:07 +02:00 |
|
Nicolas Léon
|
f33c50fdd3
|
Typo fix
|
2014-06-11 17:55:14 +02:00 |
|
Nicolas Léon
|
8126c8e1b0
|
Allow localization of date formating
|
2014-06-11 17:53:19 +02:00 |
|
Manuel Raynaud
|
2ddc0fb6a3
|
fix cs
|
2014-06-11 17:14:13 +02:00 |
|
Manuel Raynaud
|
863f7a479a
|
don't try to change permission on file during install process
|
2014-06-11 16:52:21 +02:00 |
|
Manuel Raynaud
|
5edeee6996
|
fix cs
|
2014-06-11 16:09:44 +02:00 |
|
Manuel Raynaud
|
3434010b54
|
prepare release 2.0.2
|
2014-06-11 16:05:08 +02:00 |
|
Manuel Raynaud
|
4856a5f733
|
remove unused variable
|
2014-06-11 15:59:20 +02:00 |
|
Manuel Raynaud
|
6084d9ac00
|
implement new breadcrumb on image and document edition in the catalog. Fix #460
|
2014-06-11 14:50:19 +02:00 |
|
Manuel Raynaud
|
476bda3d4a
|
implement new breadcrumb on image and document edition in the catalog
|
2014-06-11 14:50:19 +02:00 |
|
Franck Allimant
|
71ea9e9671
|
php-cs fixes.
|
2014-06-11 09:43:27 +02:00 |
|
Franck Allimant
|
441764cf94
|
Added new coupon types
|
2014-06-11 09:43:26 +02:00 |
|
Franck Allimant
|
a1ba63d5d5
|
Order total may be calculated with or without discounted items
|
2014-06-11 09:43:24 +02:00 |
|
Franck Allimant
|
80653fee0b
|
Order total may be calculated with or without discounted items
|
2014-06-11 09:43:23 +02:00 |
|
Franck Allimant
|
a1eeddc51b
|
The coupon type is now passed to te template
|
2014-06-11 09:43:22 +02:00 |
|
Franck Allimant
|
6e7d54c0aa
|
Added new coupon types
|
2014-06-11 09:43:21 +02:00 |
|
Franck Allimant
|
5c61c9c093
|
Added new coupon types translations
|
2014-06-11 09:43:20 +02:00 |
|
Franck Allimant
|
5cb01ff30f
|
Fixed typo.
|
2014-06-11 09:43:20 +02:00 |
|
Franck Allimant
|
ff78e982cd
|
Fixed typo.
|
2014-06-11 09:43:19 +02:00 |
|
Franck Allimant
|
0bb24298aa
|
replaced ucfirst by underscoreToCamelcase for calculating method name
|
2014-06-11 09:43:15 +02:00 |
|