|
|
66ce4ee218
|
Inital commit
|
2020-11-19 15:36:28 +01:00 |
|
Benjamin Perche
|
8de8939b2f
|
Fix cs
modifié: core/lib/Thelia/Action/Export.php
modifié: core/lib/Thelia/Action/Import.php
modifié: core/lib/Thelia/Config/Resources/config.xml
modifié: core/lib/Thelia/Controller/Admin/FileController.php
|
2014-08-05 15:51:44 +02:00 |
|
Julien Chanséaume
|
2b2a5690a7
|
php-cs-fixer
|
2014-08-04 20:31:27 +02:00 |
|
Julien Chanséaume
|
eaad1afdff
|
Added possibility to change the main product reference
|
2014-08-04 19:26:21 +02:00 |
|
Benjamin Perche
|
573a21e643
|
Clear Container usage in position action and fix slashes adding in CSV formatter
modifié: core/lib/Thelia/Action/Export.php
modifié: core/lib/Thelia/Action/Import.php
modifié: core/lib/Thelia/Config/Resources/action.xml
modifié: core/lib/Thelia/Core/FileFormat/Formatting/Formatter/CSVFormatter.php
|
2014-08-04 16:37:29 +02:00 |
|
Benjamin Perche
|
c6b72abd8f
|
Fix cs
modifié: core/lib/Thelia/Action/Export.php
modifié: core/lib/Thelia/Action/Import.php
modifié: core/lib/Thelia/Model/Export.php
modifié: core/lib/Thelia/Model/ExportCategory.php
modifié: core/lib/Thelia/Model/Import.php
modifié: core/lib/Thelia/Model/ImportCategory.php
|
2014-08-01 12:48:07 +02:00 |
|
Benjamin Perche
|
396bafd7a9
|
Refactor position management with trait
nouveau fichier: core/lib/Thelia/Action/Export.php
nouveau fichier: core/lib/Thelia/Action/Import.php
modifié: core/lib/Thelia/Config/Resources/action.xml
modifié: core/lib/Thelia/Config/Resources/routing/admin.xml
modifié: core/lib/Thelia/Controller/Admin/ExportController.php
modifié: core/lib/Thelia/Controller/Admin/ImportController.php
modifié: core/lib/Thelia/Core/Event/TheliaEvents.php
modifié: core/lib/Thelia/ImportExport/Export/Type/ProductTaxedPricesExport.php
modifié: core/lib/Thelia/Model/Export.php
modifié: core/lib/Thelia/Model/ExportCategory.php
modifié: core/lib/Thelia/Model/Import.php
modifié: core/lib/Thelia/Model/ImportCategory.php
modifié: templates/backOffice/default/export.html
|
2014-08-01 12:48:07 +02:00 |
|
Julien
|
1d526b437f
|
Merge pull request #560 from roadster31/coupon-fix
Coupon fix
|
2014-08-01 10:19:47 +02:00 |
|
Franck Allimant
|
24589a7142
|
Updated order discount when clearing order coupons
|
2014-07-30 16:57:42 +02:00 |
|
Guillaume Barral
|
1b2cbe6746
|
Respect of the good standards
|
2014-07-25 16:14:14 +02:00 |
|
Guillaume Barral
|
fdb68d6b95
|
Use now the dispatcher to delete feature_product when we change the template of a product
|
2014-07-25 16:14:14 +02:00 |
|
Julien
|
f06854ce48
|
Merge pull request #505 from roadster31/brands
- Brands implementation
- image + documents refactoring
- new smarty functions for form generation.
- lots of code enhancements
|
2014-07-08 11:45:44 +02:00 |
|
Franck Allimant
|
77a94d06a0
|
Fixed "you can not delete an image or a document"
|
2014-07-07 22:43:37 +02:00 |
|
Benjamin Perche
|
7a0399b303
|
End fix #511
modifié: core/lib/Thelia/Action/Customer.php
|
2014-07-07 14:41:38 +02:00 |
|
Franck Allimant
|
811e89f740
|
PHP-CS fixer pass
|
2014-07-01 01:07:56 +02:00 |
|
Franck Allimant
|
a0aa0bd1c2
|
Added brand logo image selection
|
2014-06-27 21:07:51 +02:00 |
|
Franck Allimant
|
f279131fe6
|
Added brand storage in product table
|
2014-06-27 20:12:55 +02:00 |
|
Franck Allimant
|
d969f84ae0
|
Restoired file events compatibility, factorised code
|
2014-06-26 20:18:06 +02:00 |
|
Franck Allimant
|
2c9accf58e
|
Added pre and post processing event disatching
|
2014-06-26 19:52:28 +02:00 |
|
Franck Allimant
|
ca862b07e4
|
Merge branch 'master' into brands
Conflicts:
core/lib/Thelia/Tools/FileManager.php
setup/update/2.0.3.sql
|
2014-06-26 16:35:08 +02:00 |
|
Franck Allimant
|
0dde8b888a
|
Added brands management
|
2014-06-26 10:52:13 +02:00 |
|
Franck Allimant
|
114a55c1e8
|
Refactoring of images and documents management
|
2014-06-26 10:36:12 +02:00 |
|
Benjamin Perche
|
45adf78faf
|
Correct bug with default addresses
modifié: core/lib/Thelia/Action/Address.php
|
2014-06-20 14:33:52 +02:00 |
|
Benjamin Perche
|
1f26ff997d
|
Fix bug with CreateOrUpdateAddress action
modifié: core/lib/Thelia/Action/Address.php
|
2014-06-20 11:55:13 +02:00 |
|
Franck Allimant
|
17ad1ed6fa
|
The CouponManager clear() method is now invoked.
|
2014-06-17 00:35:52 +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
|
96ebcf1880
|
Added the COUPON_CLEAR_ALL event, and a route to trigger it.
|
2014-06-12 16:39:27 +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 |
|
Guillaume Barral
|
db94749dc0
|
set the placedOrder in the createManual function
|
2014-05-19 09:43:42 +02:00 |
|
Franck Allimant
|
ab060486d0
|
Fixed Thelia\Model\Base uses.
|
2014-05-18 20:19:48 +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
|
90947bcda9
|
Free shipping restricitions based on Countries and Shipping module
|
2014-05-16 10:30:15 +02:00 |
|
Franck Allimant
|
392abff271
|
Free shipping for selected countries and/or shipping methods
|
2014-05-15 20:25:22 +02:00 |
|
Franck Allimant
|
683664cb07
|
Added Model\Module::getModuleInstance() method
|
2014-05-15 16:50:34 +02:00 |
|
Manuel Raynaud
|
85d80d1d77
|
fix minor bug
|
2014-05-09 10:55:50 +02:00 |
|
Manuel Raynaud
|
4cd2ea6316
|
complete lang form including money format
|
2014-05-06 10:53:16 +02:00 |
|
Manuel Raynaud
|
d0edbdfd5b
|
change price if needed when customer log in or log out
|
2014-04-29 11:35:10 +02:00 |
|
Manuel Raynaud
|
406b06e09d
|
use customer permanent discount
|
2014-04-29 10:56:07 +02:00 |
|
Manuel Raynaud
|
c4b2898830
|
Merge pull request #345 from roadster31/various-fixes
Various fixes
|
2014-04-28 21:56:01 +02:00 |
|
Julien Chanséaume
|
6553c6ad10
|
unnecessary code removed
|
2014-04-28 12:15:08 +02:00 |
|
Julien Chanséaume
|
3bacb0a917
|
refactore currency calculations in ProductSaleElements
|
2014-04-28 12:07:45 +02:00 |
|
Franck Allimant
|
5c6940b427
|
Uses new helper functions
|
2014-04-26 16:02:23 +02:00 |
|
Julien Chanséaume
|
b86ac88ce4
|
fix cart item prices when not on default currency
|
2014-04-25 16:55:20 +02:00 |
|
Jérôme Billiras
|
87ae693c01
|
Clear current environment caches on modules position update
|
2014-04-23 16:48:38 +02:00 |
|
Manuel Raynaud
|
5e65bf0b8a
|
change license header
|
2014-04-18 09:36:41 +02:00 |
|
Franck Allimant
|
68cbc986e1
|
Fix for #308
|
2014-04-17 23:44:19 +02:00 |
|