Commit Graph

Select branches

Hide Pull Requests

main

#1

Mono Color

• ee47488cc8 getDefaultSaleElements() returns a single ProductSaleElement Franck Allimant 2014-06-14 17:45:05 +02:00
• ae6eaefd25 Fixed @param and @return annotations Franck Allimant 2014-06-14 16:10:52 +02:00
• c43e77e766 Merge pull request #475 from stephaniepinet/order_modification Manuel Raynaud 2014-06-13 16:01:03 +02:00
• 7d92398863 Order invoice new button label stephaniepinet 2014-06-13 15:36:48 +02:00
• 7c653d63a6 Save and restore the current locale setting Nicolas Léon 2014-06-13 09:54:38 +02:00
• 0203a14674 Merge pull request #474 from alexian530/alexian530-branch Manuel Raynaud 2014-06-13 09:17:28 +02:00
• 7bf2d8ec58 Mise à jours lien fiche produit sur template order-edit dans le back-office alexian dugour 2014-06-13 08:57:28 +02:00
• ec26ebac32 php-cs fixer passed. Franck Allimant 2014-06-12 17:10:38 +02:00
• e9a0661938 Pushed forward the refactoring, using traits Franck Allimant 2014-06-12 17:00:17 +02:00
• b34f1c35c7 Fixed the checking of maximum coupon usage count Franck Allimant 2014-06-12 16:42:00 +02:00
• 992100f145 Added helper to chek if number of uses is reached Franck Allimant 2014-06-12 16:40:07 +02:00
• 96ebcf1880 Added the COUPON_CLEAR_ALL event, and a route to trigger it. Franck Allimant 2014-06-12 16:39:27 +02:00
• 95841809c4 Refactored coupons to reduce code duplication Franck Allimant 2014-06-12 13:14:46 +02:00
• db29505fee Added Attribute value related coupons Franck Allimant 2014-06-12 13:14:07 +02:00
• 147d4a70f1 Improved coupon UI Franck Allimant 2014-06-12 12:12:31 +02:00
• 9783b251c2 remove url test Manuel Raynaud 2014-06-12 10:04:33 +02:00
• 21f83e444c Merge pull request #470 from lunika/install Manuel Raynaud 2014-06-11 18:25:18 +02:00
• f33c50fdd3 Typo fix Nicolas Léon 2014-06-11 17:55:14 +02:00
• 8126c8e1b0 Allow localization of date formating Nicolas Léon 2014-06-11 17:53:19 +02:00
• 2ddc0fb6a3 fix cs Manuel Raynaud 2014-06-11 17:14:13 +02:00
• 863f7a479a don't try to change permission on file during install process Manuel Raynaud 2014-06-11 16:52:21 +02:00
• 2a795945a4 Merge pull request #463 from lunika/2.0.2 Manuel Raynaud 2014-06-11 16:24:43 +02:00
• 5edeee6996 fix cs Manuel Raynaud 2014-06-11 16:09:44 +02:00
• 3434010b54 prepare release 2.0.2 Manuel Raynaud 2014-06-11 09:56:04 +02:00
• 733794c312 Merge pull request #469 from lunika/breadcrumb Manuel Raynaud 2014-06-11 16:04:19 +02:00
• 4856a5f733 remove unused variable Manuel Raynaud 2014-06-11 15:59:20 +02:00
• b3262a537b Merge pull request #464 from touffies/frontend Manuel Raynaud 2014-06-11 15:06:44 +02:00
• 8de56ffb94 Resolve conflict git Christophe Laffont 2014-06-11 15:00:26 +02:00
• 3db2df3253 Close the dialog box when the user presses the escape (ESC) key. Christophe Laffont 2014-06-11 12:30:51 +02:00
• 75d339f811 Refactor addToProduct's and change Quantity scripts and i added a way to get the product's quickView Christophe Laffont 2014-06-11 10:15:05 +02:00
• 6084d9ac00 implement new breadcrumb on image and document edition in the catalog. Fix #460 Manuel Raynaud 2014-06-11 14:27:36 +02:00
• 476bda3d4a implement new breadcrumb on image and document edition in the catalog Manuel Raynaud 2014-06-11 10:29:52 +02:00
• afe48b2d33 Merge pull request #468 from lovenunu/master Manuel Raynaud 2014-06-11 14:35:12 +02:00
• e3d19f0dd0 Fix mail sending to ensure compatibility with secured SMTP modifié: local/modules/Front/Controller/ContactController.php Benjamin Perche 2014-06-11 14:30:12 +02:00
• dd040e3728 Merge pull request #465 from touffies/googlemap Manuel Raynaud 2014-06-11 14:28:33 +02:00
• 8949660927 Merge pull request #466 from touffies/patch-2 Manuel Raynaud 2014-06-11 14:28:08 +02:00
• c02d6e2115 Close the dialog box when the user presses the escape (ESC) key. Christophe Laffont 2014-06-11 12:30:51 +02:00
• 863c3ec1fd Avoid console errors Christophe Laffont 2014-06-11 11:37:25 +02:00
• a6a9d793c3 Delete config.codekit Christophe Laffont 2014-06-11 11:30:39 +02:00
• 2424481df3 Contact Page : Replace IFRAME by GMAP API V3. Christophe Laffont 2014-06-11 11:19:53 +02:00
• d2dfbbf4b2 Refactor addToProduct's and change Quantity scripts and i added a way to get the product's quickView Christophe Laffont 2014-06-11 10:15:05 +02:00
• 5279cc72ce Merge pull request #462 from touffies/patch-1 Manuel Raynaud 2014-06-11 09:57:31 +02:00
• 0da2b2de04 Merge pull request #459 from roadster31/coupon-type Manuel Raynaud 2014-06-11 09:52:20 +02:00
• ad02198e19 Merge branch 'coupon-type' of https://github.com/roadster31/thelia into coupon-type Franck Allimant 2014-06-11 09:46:15 +02:00
• 4b4a31aed5 Added coupon changes details. Franck Allimant 2014-06-11 09:39:59 +02:00
• 71ea9e9671 php-cs fixes. Franck Allimant 2014-06-10 16:34:33 +02:00
• 441764cf94 Added new coupon types Franck Allimant 2014-06-10 16:04:30 +02:00
• 89bf71f4b0 Added new coupon type translations Franck Allimant 2014-06-10 16:03:08 +02:00
• 8f5369a1b8 Coupon type template framgment may define a couponInputFormSetup JS function Franck Allimant 2014-06-10 16:01:38 +02:00
• a1ba63d5d5 Order total may be calculated with or without discounted items Franck Allimant 2014-06-10 16:00:46 +02:00
• 80653fee0b Order total may be calculated with or without discounted items Franck Allimant 2014-06-10 15:59:36 +02:00
• a1eeddc51b The coupon type is now passed to te template Franck Allimant 2014-06-10 15:59:02 +02:00
• 6e7d54c0aa Added new coupon types Franck Allimant 2014-06-10 15:58:28 +02:00
• 5c61c9c093 Added new coupon types translations Franck Allimant 2014-06-10 15:58:01 +02:00
• 5cb01ff30f Fixed typo. Franck Allimant 2014-06-10 15:57:33 +02:00
• ff78e982cd Fixed typo. Franck Allimant 2014-06-10 15:56:38 +02:00
• 71a6497edb Added js=1 parameter toi {intl} calls used in javascript strings Franck Allimant 2014-06-10 15:55:23 +02:00
• 8869a3c571 Changed {navigate to="return_to"} to {navigate to="previous"} Franck Allimant 2014-06-10 15:54:42 +02:00
• 0f3e99ac1f Fixed InvalidArgumentException: No module found for code 'default' Franck Allimant 2014-06-10 15:52:08 +02:00
• 0bb24298aa replaced ucfirst by underscoreToCamelcase for calculating method name Franck Allimant 2014-06-05 18:49:40 +02:00
• 5873b29fc1 Changed "return_to" into "previous" Franck Allimant 2014-06-04 16:14:04 +02:00
• 15da99446c Added "js" parameter to intl function for a safe usage in JS string, Franck Allimant 2014-05-31 16:27:32 +02:00
• 87837224f7 PHP-CS fixer Franck Allimant 2014-05-31 15:41:51 +02:00
• 919e0ac09b Checked coupon type before trying to get the service. Franck Allimant 2014-05-30 20:17:41 +02:00
• de5a2025cd Fixed coupon input field name Franck Allimant 2014-05-30 20:12:41 +02:00
• d9164495d3 Removed no longer useful tests Franck Allimant 2014-05-30 20:12:23 +02:00
• 0683d20d2c Improved and simplified coupon form management Franck Allimant 2014-05-30 19:58:02 +02:00
• a743b7f20d Added coupon changes details. Franck Allimant 2014-06-11 09:39:59 +02:00
• fdbf166b36 Clean up mini-cart.html Christophe Laffont 2014-06-11 09:32:27 +02:00
• 13e74f783a php-cs fixes. Franck Allimant 2014-06-10 16:34:33 +02:00
• b6ae937a1d Added new coupon types Franck Allimant 2014-06-10 16:04:30 +02:00
• acca19e9d1 Added new coupon type translations Franck Allimant 2014-06-10 16:03:08 +02:00
• fc1061b556 Coupon type template framgment may define a couponInputFormSetup JS function Franck Allimant 2014-06-10 16:01:38 +02:00
• 511bdf0d7c Order total may be calculated with or without discounted items Franck Allimant 2014-06-10 16:00:46 +02:00
• 39ff464319 Order total may be calculated with or without discounted items Franck Allimant 2014-06-10 15:59:36 +02:00
• 993be2f37a The coupon type is now passed to te template Franck Allimant 2014-06-10 15:59:02 +02:00
• 296d697e3f Added new coupon types Franck Allimant 2014-06-10 15:58:28 +02:00
• f13ec21337 Added new coupon types translations Franck Allimant 2014-06-10 15:58:01 +02:00
• 1916e2a63d Fixed typo. Franck Allimant 2014-06-10 15:57:33 +02:00
• f2770c5a2b Fixed typo. Franck Allimant 2014-06-10 15:56:38 +02:00
• 466f938cd5 Added js=1 parameter toi {intl} calls used in javascript strings Franck Allimant 2014-06-10 15:55:23 +02:00
• 4ab3149bca Changed {navigate to="return_to"} to {navigate to="previous"} Franck Allimant 2014-06-10 15:54:42 +02:00
• 49411183da Fixed InvalidArgumentException: No module found for code 'default' Franck Allimant 2014-06-10 15:52:08 +02:00
• a018102572 Merge pull request #457 from bilhackmac/RefreshCommand Manuel Raynaud 2014-06-10 12:26:17 +02:00
• 5c8584c398 Code review following pull request comments Jérôme Billiras 2014-06-10 11:43:06 +02:00
• bead28f5d2 Update test to consider only standards modules Jérôme Billiras 2014-06-10 11:13:06 +02:00
• 0381239881 Add refresh command tests Jérôme Billiras 2014-06-10 10:37:48 +02:00
• 76b08ddca9 Register refresh command to Thelia core Jérôme Billiras 2014-06-10 10:34:19 +02:00
• f6aa0ed7da Add refresh command Jérôme Billiras 2014-06-10 10:33:47 +02:00
• c8d5bdb1e7 Merge pull request #455 from lovenunu/master Manuel Raynaud 2014-06-06 12:34:52 +02:00
• da959c3732 Fix typo order_tab instead of oder_tab smarty variable modifié: templates/backOffice/default/order-edit.html Benjamin Perche 2014-06-06 10:47:22 +02:00
• 415b444e6b Merge pull request #454 from lunika/2.0.2 Julien 2014-06-06 09:12:33 +02:00
• c552f8485a fiw wrong description in search page Manuel Raynaud 2014-06-06 09:06:42 +02:00
• eb23187782 replaced ucfirst by underscoreToCamelcase for calculating method name Franck Allimant 2014-06-05 18:49:40 +02:00
• 980cd08704 fix cs Manuel Raynaud 2014-06-05 17:39:15 +02:00
• 83ed4aa833 fix copy/past issue Manuel Raynaud 2014-06-05 17:13:36 +02:00
• a4e28e5561 implement search on content loop. Manuel Raynaud 2014-06-05 13:24:53 +02:00
• 57cf2d1a10 implement seach on content loop. Manuel Raynaud 2014-06-05 13:19:21 +02:00
• ac028a70b5 implement seach on category loop. Manuel Raynaud 2014-06-05 13:12:04 +02:00
• 86c34f589c fix payment and delivery form. Fix #434 Manuel Raynaud 2014-06-05 10:29:27 +02:00