new branch coupon

This commit is contained in:
gmorel
2013-12-25 14:12:51 +01:00
parent 4c9eff379a
commit 69d255f782
767 changed files with 5 additions and 1 deletions

3
.gitmodules vendored Normal file
View File

@@ -0,0 +1,3 @@
[submodule "local/modules/CouponGiveProduct"]
path = local/modules/CouponGiveProduct
url = https://github.com/gmorel/thelia2-coupon-give-free-product.git

0
CHANGELOG.txt Normal file → Executable file
View File

0
CONTRIBUTORS.txt Normal file → Executable file
View File

0
core/lib/Thelia/Action/Address.php Normal file → Executable file
View File

0
core/lib/Thelia/Action/Administrator.php Normal file → Executable file
View File

0
core/lib/Thelia/Action/Area.php Normal file → Executable file
View File

0
core/lib/Thelia/Action/Attribute.php Normal file → Executable file
View File

0
core/lib/Thelia/Action/AttributeAv.php Normal file → Executable file
View File

0
core/lib/Thelia/Action/BaseCachedFile.php Normal file → Executable file
View File

0
core/lib/Thelia/Action/Cache.php Normal file → Executable file
View File

0
core/lib/Thelia/Action/Config.php Normal file → Executable file
View File

0
core/lib/Thelia/Action/Content.php Normal file → Executable file
View File

0
core/lib/Thelia/Action/Country.php Normal file → Executable file
View File

0
core/lib/Thelia/Action/Currency.php Normal file → Executable file
View File

0
core/lib/Thelia/Action/Document.php Normal file → Executable file
View File

0
core/lib/Thelia/Action/Feature.php Normal file → Executable file
View File

0
core/lib/Thelia/Action/FeatureAv.php Normal file → Executable file
View File

0
core/lib/Thelia/Action/Folder.php Normal file → Executable file
View File

0
core/lib/Thelia/Action/Lang.php Normal file → Executable file
View File

0
core/lib/Thelia/Action/MailingSystem.php Normal file → Executable file
View File

0
core/lib/Thelia/Action/Message.php Normal file → Executable file
View File

0
core/lib/Thelia/Action/Module.php Normal file → Executable file
View File

0
core/lib/Thelia/Action/Newsletter.php Normal file → Executable file
View File

0
core/lib/Thelia/Action/Pdf.php Normal file → Executable file
View File

0
core/lib/Thelia/Action/Product.php Normal file → Executable file
View File

0
core/lib/Thelia/Action/ProductSaleElement.php Normal file → Executable file
View File

0
core/lib/Thelia/Action/Profile.php Normal file → Executable file
View File

0
core/lib/Thelia/Action/ShippingZone.php Normal file → Executable file
View File

0
core/lib/Thelia/Action/Tax.php Normal file → Executable file
View File

0
core/lib/Thelia/Action/TaxRule.php Normal file → Executable file
View File

0
core/lib/Thelia/Action/Template.php Normal file → Executable file
View File

0
core/lib/Thelia/Command/AdminUpdatePasswordCommand.php Normal file → Executable file
View File

0
core/lib/Thelia/Command/CreateAdminUser.php Normal file → Executable file
View File

0
core/lib/Thelia/Command/GenerateResources.php Normal file → Executable file
View File

0
core/lib/Thelia/Command/ReloadDatabaseCommand.php Normal file → Executable file
View File

0
core/lib/Thelia/Condition/ConditionCollection.php Normal file → Executable file
View File

0
core/lib/Thelia/Condition/ConditionEvaluator.php Normal file → Executable file
View File

0
core/lib/Thelia/Condition/ConditionFactory.php Normal file → Executable file
View File

0
core/lib/Thelia/Condition/ConditionOrganizer.php Normal file → Executable file
View File

View File

View File

View File

View File

View File

View File

0
core/lib/Thelia/Condition/Operators.php Normal file → Executable file
View File

0
core/lib/Thelia/Condition/SerializableCondition.php Normal file → Executable file
View File

0
core/lib/Thelia/Config/I18n/en_US.php Normal file → Executable file
View File

0
core/lib/Thelia/Config/I18n/es_ES.php Normal file → Executable file
View File

0
core/lib/Thelia/Config/I18n/fr_FR.php Normal file → Executable file
View File

0
core/lib/Thelia/Config/I18n/it_IT.php Normal file → Executable file
View File

0
core/lib/Thelia/Config/Resources/command.xml Normal file → Executable file
View File

0
core/lib/Thelia/Config/Resources/coupon.xml Normal file → Executable file
View File

0
core/lib/Thelia/Config/Resources/form.xml Normal file → Executable file
View File

0
core/lib/Thelia/Config/Resources/loop.xml Normal file → Executable file
View File

0
core/lib/Thelia/Config/Resources/smarty-plugin.xml Normal file → Executable file
View File

0
core/lib/Thelia/Config/Resources/translation.xml Normal file → Executable file
View File

View File

0
core/lib/Thelia/Controller/Admin/AddressController.php Normal file → Executable file
View File

View File

View File

0
core/lib/Thelia/Controller/Admin/AreaController.php Normal file → Executable file
View File

View File

View File

0
core/lib/Thelia/Controller/Admin/ConfigController.php Normal file → Executable file
View File

View File

0
core/lib/Thelia/Controller/Admin/ContentController.php Normal file → Executable file
View File

0
core/lib/Thelia/Controller/Admin/CountryController.php Normal file → Executable file
View File

View File

View File

View File

0
core/lib/Thelia/Controller/Admin/FeatureController.php Normal file → Executable file
View File

0
core/lib/Thelia/Controller/Admin/FolderController.php Normal file → Executable file
View File

0
core/lib/Thelia/Controller/Admin/HomeController.php Normal file → Executable file
View File

0
core/lib/Thelia/Controller/Admin/LangController.php Normal file → Executable file
View File

View File

View File

0
core/lib/Thelia/Controller/Admin/MessageController.php Normal file → Executable file
View File

0
core/lib/Thelia/Controller/Admin/ModuleController.php Normal file → Executable file
View File

0
core/lib/Thelia/Controller/Admin/OrderController.php Normal file → Executable file
View File

2
core/lib/Thelia/Controller/Admin/ProductController.php Normal file → Executable file
View File

@@ -1110,7 +1110,7 @@ class ProductController extends AbstractCrudController
$this->dispatch(TheliaEvents::PRODUCT_COMBINATION_GENERATION, $event);
// Log object modification
$this->adminLogAppend(sprintf("Combination generation for product reference %s", $event->getProduct()->getRef()));
$this->adminLogAppend(sprintf("Combination generation for product reference %s", $event->getProduct()->getRef()), 'ac', 'mes');
// Redirect to the success URL
$this->redirect($changeForm->getSuccessUrl());

0
core/lib/Thelia/Controller/Admin/ProfileController.php Normal file → Executable file
View File

View File

View File

0
core/lib/Thelia/Controller/Admin/TaxController.php Normal file → Executable file
View File

0
core/lib/Thelia/Controller/Admin/TaxRuleController.php Normal file → Executable file
View File

View File

View File

View File

0
core/lib/Thelia/Core/Event/AccessoryEvent.php Normal file → Executable file
View File

View File

0
core/lib/Thelia/Core/Event/Address/AddressEvent.php Normal file → Executable file
View File

View File

View File

0
core/lib/Thelia/Core/Event/Area/AreaCreateEvent.php Normal file → Executable file
View File

0
core/lib/Thelia/Core/Event/Area/AreaDeleteEvent.php Normal file → Executable file
View File

0
core/lib/Thelia/Core/Event/Area/AreaEvent.php Normal file → Executable file
View File

View File

0
core/lib/Thelia/Core/Event/Area/AreaUpdateEvent.php Normal file → Executable file
View File

Some files were not shown because too many files have changed in this diff Show More