diff --git a/local/media/images/product/152-SCHNEIDER_Cadre_ALTIRA b/local/media/images/product/152-SCHNEIDER_Cadre_ALTIRA index 63421eeb..071fef03 100644 Binary files a/local/media/images/product/152-SCHNEIDER_Cadre_ALTIRA and b/local/media/images/product/152-SCHNEIDER_Cadre_ALTIRA differ diff --git a/local/media/images/product/153-SCHNEIDER_Cadre_ALTIRA_3_postes b/local/media/images/product/153-SCHNEIDER_Cadre_ALTIRA_3_postes index b3adaaa8..98d41950 100644 Binary files a/local/media/images/product/153-SCHNEIDER_Cadre_ALTIRA_3_postes and b/local/media/images/product/153-SCHNEIDER_Cadre_ALTIRA_3_postes differ diff --git a/local/media/images/product/157-SCHNEIDER_Cadre_ALTIRA_2_postes_schiste-1 b/local/media/images/product/157-SCHNEIDER_Cadre_ALTIRA_2_postes_schiste-1 index 0a2199c5..64db7137 100644 Binary files a/local/media/images/product/157-SCHNEIDER_Cadre_ALTIRA_2_postes_schiste-1 and b/local/media/images/product/157-SCHNEIDER_Cadre_ALTIRA_2_postes_schiste-1 differ diff --git a/local/media/images/product/159-SCHNEIDER_Cadre_ALTIRA_3_postes_schiste-1 b/local/media/images/product/159-SCHNEIDER_Cadre_ALTIRA_3_postes_schiste-1 index 942ad6b1..0861548f 100644 Binary files a/local/media/images/product/159-SCHNEIDER_Cadre_ALTIRA_3_postes_schiste-1 and b/local/media/images/product/159-SCHNEIDER_Cadre_ALTIRA_3_postes_schiste-1 differ diff --git a/local/media/images/product/160-SCHNEIDER_Cadre_ALTIRA_3_postes_horizontal_schiste-1 b/local/media/images/product/160-SCHNEIDER_Cadre_ALTIRA_3_postes_horizontal_schiste-1 index eeb444e8..5de3273d 100644 Binary files a/local/media/images/product/160-SCHNEIDER_Cadre_ALTIRA_3_postes_horizontal_schiste-1 and b/local/media/images/product/160-SCHNEIDER_Cadre_ALTIRA_3_postes_horizontal_schiste-1 differ diff --git a/local/media/images/product/161-SCHNEIDER_Cadre_ALTIRA_2x3_postes_schiste-1 b/local/media/images/product/161-SCHNEIDER_Cadre_ALTIRA_2x3_postes_schiste-1 index ccc029c4..1fb20c8f 100644 Binary files a/local/media/images/product/161-SCHNEIDER_Cadre_ALTIRA_2x3_postes_schiste-1 and b/local/media/images/product/161-SCHNEIDER_Cadre_ALTIRA_2x3_postes_schiste-1 differ diff --git a/local/media/images/product/162-SCHNEIDER_Cadre_ALTIRA_3_postes_vertical_schiste-1 b/local/media/images/product/162-SCHNEIDER_Cadre_ALTIRA_3_postes_vertical_schiste-1 index 8973677d..710252a9 100644 Binary files a/local/media/images/product/162-SCHNEIDER_Cadre_ALTIRA_3_postes_vertical_schiste-1 and b/local/media/images/product/162-SCHNEIDER_Cadre_ALTIRA_3_postes_vertical_schiste-1 differ diff --git a/local/media/images/product/176-SCHNEIDER_Cadre_ALTIRA_2_postes b/local/media/images/product/176-SCHNEIDER_Cadre_ALTIRA_2_postes index 0195bf1d..fcce830d 100644 Binary files a/local/media/images/product/176-SCHNEIDER_Cadre_ALTIRA_2_postes and b/local/media/images/product/176-SCHNEIDER_Cadre_ALTIRA_2_postes differ diff --git a/local/media/images/product/183-SCHNEIDER_Cadre_ALT b/local/media/images/product/183-SCHNEIDER_Cadre_ALT index 49648ce6..6ba8b127 100644 Binary files a/local/media/images/product/183-SCHNEIDER_Cadre_ALT and b/local/media/images/product/183-SCHNEIDER_Cadre_ALT differ diff --git a/local/media/images/product/186-SCHNEIDER_Cadre_ALTIRA_3_postes_hori b/local/media/images/product/186-SCHNEIDER_Cadre_ALTIRA_3_postes_hori index 4ad47278..472ad8f7 100644 Binary files a/local/media/images/product/186-SCHNEIDER_Cadre_ALTIRA_3_postes_hori and b/local/media/images/product/186-SCHNEIDER_Cadre_ALTIRA_3_postes_hori differ diff --git a/local/media/images/product/198-J b/local/media/images/product/198-J index 28610c32..e889469e 100644 Binary files a/local/media/images/product/198-J and b/local/media/images/product/198-J differ diff --git a/local/media/images/product/205-JUNG_AL2983-1. b/local/media/images/product/205-JUNG_AL2983-1. index 4570c7a9..146cca6f 100644 Binary files a/local/media/images/product/205-JUNG_AL2983-1. and b/local/media/images/product/205-JUNG_AL2983-1. differ diff --git a/local/media/images/product/211-JUNG_A b/local/media/images/product/211-JUNG_A index 4a4c5441..dd96fce9 100644 Binary files a/local/media/images/product/211-JUNG_A and b/local/media/images/product/211-JUNG_A differ diff --git a/local/media/images/product/216-JUNG_ES2984- b/local/media/images/product/216-JUNG_ES2984- index f02b792c..89548850 100644 Binary files a/local/media/images/product/216-JUNG_ES2984- and b/local/media/images/product/216-JUNG_ES2984- differ diff --git a/local/media/images/product/221-JUNG_GCR298 b/local/media/images/product/221-JUNG_GCR298 index a3e75f2c..27cb9907 100644 Binary files a/local/media/images/product/221-JUNG_GCR298 and b/local/media/images/product/221-JUNG_GCR298 differ diff --git a/local/media/images/product/226-JUNG_GO2981- b/local/media/images/product/226-JUNG_GO2981- index 20a48fdc..bbba7106 100644 Binary files a/local/media/images/product/226-JUNG_GO2981- and b/local/media/images/product/226-JUNG_GO2981- differ diff --git a/local/media/images/product/233-JUNG_ME2981 b/local/media/images/product/233-JUNG_ME2981 index 882caeba..55bb3519 100644 Binary files a/local/media/images/product/233-JUNG_ME2981 and b/local/media/images/product/233-JUNG_ME2981 differ diff --git a/local/modules/LocalPickup/Config/config.xml b/local/modules/LocalPickup/Config/config.xml new file mode 100644 index 00000000..fc91bb35 --- /dev/null +++ b/local/modules/LocalPickup/Config/config.xml @@ -0,0 +1,31 @@ + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/local/modules/LocalPickup/Config/module.xml b/local/modules/LocalPickup/Config/module.xml new file mode 100644 index 00000000..8b956e03 --- /dev/null +++ b/local/modules/LocalPickup/Config/module.xml @@ -0,0 +1,18 @@ + + + LocalPickup\LocalPickup + + Local Pickup + + + Retrait sur place + + 1.2 + + Thelia + info@thelia.net + + delivery + 2.3.0 + alpha + diff --git a/local/modules/LocalPickup/Config/routing.xml b/local/modules/LocalPickup/Config/routing.xml new file mode 100644 index 00000000..32474b3e --- /dev/null +++ b/local/modules/LocalPickup/Config/routing.xml @@ -0,0 +1,9 @@ + + + + + LocalPickup\Controller\SetDeliveryPrice::configure + + diff --git a/local/modules/LocalPickup/Controller/SetDeliveryPrice.php b/local/modules/LocalPickup/Controller/SetDeliveryPrice.php new file mode 100644 index 00000000..addc1564 --- /dev/null +++ b/local/modules/LocalPickup/Controller/SetDeliveryPrice.php @@ -0,0 +1,60 @@ + + * @contributor Thomas Arnaud + */ +class SetDeliveryPrice extends BaseAdminController +{ + public function configure() + { + if (null !== $response = $this->checkAuth(array(AdminResources::MODULE), array('LocalPickup'), AccessManager::UPDATE)) { + return $response; + } + + $form = $this->createForm('localpickup.form'); + $errmes=null; + + try { + $vform = $this->validateForm($form); + + $price = $vform->get('price')->getData(); + + LocalPickup::setConfigValue(LocalPickup::PRICE_VAR_NAME, floatval($price)); + } catch (\Exception $ex) { + $errmes = $this->createStandardFormValidationErrorMessage($ex); + } + + if (null !== $errmes) { + $this->setupFormErrorContext( + 'configuration', + $errmes, + $form, + $ex + ); + } + + return RedirectResponse::create(URL::getInstance()->absoluteUrl('/admin/module/LocalPickup')); + } +} diff --git a/local/modules/LocalPickup/Form/SetDeliveryPrice.php b/local/modules/LocalPickup/Form/SetDeliveryPrice.php new file mode 100644 index 00000000..af8d1a93 --- /dev/null +++ b/local/modules/LocalPickup/Form/SetDeliveryPrice.php @@ -0,0 +1,53 @@ +formBuilder + ->add( + "price", + "number", + [ + "label"=>Translator::getInstance()->trans("Price", [], LocalPickup::DOMAIN_NAME), + "label_attr"=> [ + "for"=>"pricefield" + ], + "constraints"=> [ new NotBlank(), new GreaterThanOrEqual([ 'value' => 0 ]) ] + ] + ) + ; + } + + /** + * @return string the name of you form. This name must be unique + */ + public function getName() + { + return "set-delivery-price-localpickup"; + } + +} diff --git a/local/modules/LocalPickup/Hook/HookManager.php b/local/modules/LocalPickup/Hook/HookManager.php new file mode 100644 index 00000000..ca70eadd --- /dev/null +++ b/local/modules/LocalPickup/Hook/HookManager.php @@ -0,0 +1,49 @@ + + */ +class HookManager extends BaseHook +{ + public function onModuleConfiguration(HookRenderEvent $event) + { + $event->add( + $this->render( + "module_configuration.html", + [ + 'price' => floatval(LocalPickup::getConfigValue(LocalPickup::PRICE_VAR_NAME, 0)) + ] + ) + ); + } + + public function onOrderInvoiceDeliveryAddress(HookRenderEvent $event) + { + // Show the local delivery template if we're the current delivery module. + if ((null !== $order = $this->getSession()->getOrder()) && $order->getDeliveryModuleId() == LocalPickup::getModuleId()) { + $event->add( + $this->render("localpickup/order-invoice-delivery-address.html", [ + 'order_id' => $event->getArgument('order_id'), + ]) + ); + } + } +} diff --git a/local/modules/LocalPickup/I18n/backOffice/default/en_US.php b/local/modules/LocalPickup/I18n/backOffice/default/en_US.php new file mode 100644 index 00000000..1a865fc8 --- /dev/null +++ b/local/modules/LocalPickup/I18n/backOffice/default/en_US.php @@ -0,0 +1,7 @@ + 'Close', + 'Configure local pickup price' => 'Configure local pickup price ', + 'Save changes' => 'Save changes ', +); diff --git a/local/modules/LocalPickup/I18n/backOffice/default/fr_FR.php b/local/modules/LocalPickup/I18n/backOffice/default/fr_FR.php new file mode 100644 index 00000000..05424582 --- /dev/null +++ b/local/modules/LocalPickup/I18n/backOffice/default/fr_FR.php @@ -0,0 +1,7 @@ + 'Fermer', + 'Configure local pickup price' => 'Configurer le prix du retrait sur place', + 'Save changes' => 'Enregistrer les modifications', +); diff --git a/local/modules/LocalPickup/I18n/en_US.php b/local/modules/LocalPickup/I18n/en_US.php new file mode 100644 index 00000000..f0b1eb69 --- /dev/null +++ b/local/modules/LocalPickup/I18n/en_US.php @@ -0,0 +1,6 @@ + 'Price', + 'price must be a number !' => 'price must be a number !', +); diff --git a/local/modules/LocalPickup/I18n/fr_FR.php b/local/modules/LocalPickup/I18n/fr_FR.php new file mode 100644 index 00000000..d3160cb2 --- /dev/null +++ b/local/modules/LocalPickup/I18n/fr_FR.php @@ -0,0 +1,6 @@ + 'Prix', + 'price must be a number !' => 'Le prix doit être un nombre !', +); diff --git a/local/modules/LocalPickup/LICENSE.txt b/local/modules/LocalPickup/LICENSE.txt new file mode 100644 index 00000000..94a9ed02 --- /dev/null +++ b/local/modules/LocalPickup/LICENSE.txt @@ -0,0 +1,674 @@ + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + Copyright (C) + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +. diff --git a/local/modules/LocalPickup/Listener/SendEMail.php b/local/modules/LocalPickup/Listener/SendEMail.php new file mode 100644 index 00000000..973e29ff --- /dev/null +++ b/local/modules/LocalPickup/Listener/SendEMail.php @@ -0,0 +1,92 @@ + + */ +class SendEMail extends BaseAction implements EventSubscriberInterface +{ + /** + * @var MailerFactory + */ + protected $mailer; + + public function __construct(MailerFactory $mailer) + { + $this->mailer = $mailer; + } + + /* + * Send a mail to the customer qhen the order is set to the Sent Status. + * + * @param OrderEvent $event + * @throws \Propel\Runtime\Exception\PropelException + */ + public function updateStatus(OrderEvent $event) + { + if ($event->getOrder()->getDeliveryModuleId() === LocalPickup::getModuleId()) { + if ($event->getOrder()->isSent()) { + $order = $event->getOrder(); + $customer = $order->getCustomer(); + $store = ConfigQuery::create(); + + if (null !== $country = CountryQuery::create()->findPk($store->read("store_country"))) { + $countryName = $country->setLocale($order->getLang()->getLocale())->getTitle(); + } else { + $countryName = ''; + } + + $this->mailer->sendEmailToCustomer( + 'order_confirmation_localpickup', + $customer, + [ + 'order_id' => $order->getId(), + 'order_ref' => $order->getRef(), + 'store_name' => ConfigQuery::read("store_name"), + 'store_address1' => ConfigQuery::read("store_address1"), + 'store_address2' => ConfigQuery::read("store_address2"), + 'store_address3' => ConfigQuery::read("store_address3"), + 'store_zipcode' => ConfigQuery::read("store_zipcode"), + 'store_city' => ConfigQuery::read("store_city"), + 'store_country' => $countryName + ] + ); + } + } + } + + /** + * @inheritdoc + */ + public static function getSubscribedEvents() + { + return array( + TheliaEvents::ORDER_UPDATE_STATUS => array("updateStatus", 128) + ); + } +} diff --git a/local/modules/LocalPickup/Listener/UpdateDeliveryAddress.php b/local/modules/LocalPickup/Listener/UpdateDeliveryAddress.php new file mode 100644 index 00000000..5c873a25 --- /dev/null +++ b/local/modules/LocalPickup/Listener/UpdateDeliveryAddress.php @@ -0,0 +1,107 @@ +. */ +/* */ +/*************************************************************************************/ + +namespace LocalPickup\Listener; + +use LocalPickup\LocalPickup; +use Symfony\Component\EventDispatcher\EventDispatcherInterface; +use Symfony\Component\EventDispatcher\EventSubscriberInterface; +use Thelia\Action\BaseAction; +use Thelia\Core\Event\Order\OrderAddressEvent; +use Thelia\Core\Event\Order\OrderEvent; +use Thelia\Core\Event\TheliaEvents; +use Thelia\Model\ConfigQuery; +use Thelia\Model\OrderAddressQuery; + +/** + * Class UpdateDeliveryAddress + * @package LocalPickup\Listener + * @contributor Thomas Arnaud + */ +class UpdateDeliveryAddress extends BaseAction implements EventSubscriberInterface +{ + /** + * @param OrderEvent $event + * @param $eventName + * @param EventDispatcherInterface $dispatcher + * @throws \Exception + */ + public function updateAddress(OrderEvent $event, $eventName, EventDispatcherInterface $dispatcher) + { + if ($event->getOrder()->getDeliveryModuleId() === LocalPickup::getModuleId()) { + $address_id = $event->getOrder()->getDeliveryOrderAddressId(); + $address = OrderAddressQuery::create()->findPk($address_id); + + if ($address !== null) { + $address1 = ConfigQuery::read("store_address1"); + $address2 = ConfigQuery::read("store_address2"); + $address3 = ConfigQuery::read("store_address3"); + $zipcode = ConfigQuery::read("store_zipcode"); + $city = ConfigQuery::read("store_city"); + $country = ConfigQuery::read("store_country"); + $name = ConfigQuery::read("store_name"); + + if ($address1 !== null && $zipcode !== null && $city !== null && $country !== null) { + $address_event = new OrderAddressEvent( + $address->getCustomerTitleId(), + $address->getFirstname(), + $address->getLastname(), + $address1, + $address2, + $address3, + $zipcode, + $city, + $country, + $address->getPhone(), + $name, + $address->getCellphone() + ); + + $address_event->setOrderAddress($address); + + $dispatcher->dispatch(TheliaEvents::ORDER_UPDATE_ADDRESS, $address_event); + } + } else { + throw new \Exception("Error: order deliery address doesn't exists"); + } + } + } + + public function setAddress(OrderEvent $event) + { + if ($event->getOrder()->getDeliveryModuleId() === LocalPickup::getModuleId()) { + $event->setDeliveryAddress(null); + } + } + + /** + * @inheritdoc + */ + public static function getSubscribedEvents() + { + return array( + TheliaEvents::ORDER_BEFORE_PAYMENT=> ["updateAddress", 130], + TheliaEvents::ORDER_SET_DELIVERY_MODULE=> ["setAddress", 128] + ); + } +} diff --git a/local/modules/LocalPickup/LocalPickup.php b/local/modules/LocalPickup/LocalPickup.php new file mode 100644 index 00000000..98da11bd --- /dev/null +++ b/local/modules/LocalPickup/LocalPickup.php @@ -0,0 +1,76 @@ +. */ +/* */ +/*************************************************************************************/ + +namespace LocalPickup; + +use Propel\Runtime\Connection\ConnectionInterface; +use Thelia\Install\Database; +use Thelia\Model\Country; +use Thelia\Module\AbstractDeliveryModule; + +/** + * Class LocalPickup + * @package LocalPickup + * @author Thelia + */ +class LocalPickup extends AbstractDeliveryModule +{ + const DOMAIN_NAME = 'localpickup'; + + const PRICE_VAR_NAME = 'price'; + + /** + * @inheritdoc + */ + public function getPostage(Country $country) + { + return floatval(LocalPickup::getConfigValue(self::PRICE_VAR_NAME, 0)); + } + + public function update($currentVersion, $newVersion, ConnectionInterface $con = null) + { + if ($newVersion === '1.2') { + $db = new Database($con); + + // Migrate previous price from database to module config + try { + $statement = $db->execute("select price from local_pickup_shipping order by id desc limit 1"); + + $price = floatval($statement->fetchColumn(0)); + + LocalPickup::setConfigValue(self::PRICE_VAR_NAME, $price); + } catch (\Exception $ex) { + //LocalPickup::setConfigValue(self::PRICE_VAR_NAME, 0); + } + } + } + + + /** + * @inheritdoc + */ + public function isValidDelivery(Country $country) + { + return true; + } +} diff --git a/local/modules/LocalPickup/Loop/LocalAddress.php b/local/modules/LocalPickup/Loop/LocalAddress.php new file mode 100644 index 00000000..77b5bc4a --- /dev/null +++ b/local/modules/LocalPickup/Loop/LocalAddress.php @@ -0,0 +1,126 @@ +. */ +/* */ +/*************************************************************************************/ + +namespace LocalPickup\Loop; + +use Symfony\Component\Config\Definition\Exception\Exception; +use Thelia\Core\Template\Element\ArraySearchLoopInterface; +use Thelia\Core\Template\Element\BaseLoop; +use Thelia\Core\Template\Element\LoopResult; +use Thelia\Core\Template\Element\LoopResultRow; +use Thelia\Core\Template\Loop\Argument\Argument; +use Thelia\Core\Template\Loop\Argument\ArgumentCollection; +use Thelia\Model\AddressQuery; +use Thelia\Model\ConfigQuery; + +/** + * Class LocalAddress + * @package LocalPickup\Loop + * @author Thelia + * @method int getId() + */ +class LocalAddress extends BaseLoop implements ArraySearchLoopInterface +{ + /** + * @inheritdoc + */ + public function buildArray() + { + $id = $this->getId(); + + /** @var \Thelia\Core\HttpFoundation\Session\Session $session */ + $session = $this->requestStack->getCurrentRequest()->getSession(); + + $address = AddressQuery::create() + ->filterByCustomerId($session->getCustomerUser()->getId()) + ->findPk($id); + + if ($address === null) { + throw new Exception("The requested address doesn't exist"); + } + + /** @var \Thelia\Model\Customer $customer */ + $customer = $session->getCustomerUser(); + + return [ + 'Id' => 0, + 'Label' => $address->getLabel(), + 'CustomerId' => $address->getCustomerId(), + 'TitleId' => $address->getTitleId(), + 'Company' => ConfigQuery::read('store_name'), + 'Firstname' => $customer->getFirstname(), + 'Lastname' => $customer->getLastname(), + 'Address1' => ConfigQuery::read('store_address1'), + 'Address2' => ConfigQuery::read('store_address2'), + 'Address3' => ConfigQuery::read('store_address3'), + 'Zipcode' => ConfigQuery::read('store_zipcode'), + 'City' => ConfigQuery::read('store_city'), + 'CountryId' => ConfigQuery::read('store_country'), + 'Phone' => $address->getPhone(), + 'Cellphone' => $address->getCellphone(), + 'IsDefault' => 0 + ]; + } + + /** + * @inheritdoc + */ + public function parseResults(LoopResult $loopResult) + { + $address = $loopResult->getResultDataCollection(); + $loopResultRow = new LoopResultRow($address); + + $loopResultRow + ->set("ID", $address['Id']) + ->set("LABEL", $address['Label']) + ->set("CUSTOMER", $address['CustomerId']) + ->set("TITLE", $address['TitleId']) + ->set("COMPANY", $address['Company']) + ->set("FIRSTNAME", $address['Firstname']) + ->set("LASTNAME", $address['Lastname']) + ->set("ADDRESS1", $address['Address1']) + ->set("ADDRESS2", $address['Address2']) + ->set("ADDRESS3", $address['Address3']) + ->set("ZIPCODE", $address['Zipcode']) + ->set("CITY", $address['City']) + ->set("COUNTRY", $address['CountryId']) + ->set("PHONE", $address['Phone']) + ->set("CELLPHONE", $address['Cellphone']) + ->set("DEFAULT", $address['IsDefault']) + ; + + $loopResult->addRow($loopResultRow); + + return $loopResult; + } + + /** + * @inheritdoc + */ + protected function getArgDefinitions() + { + return new ArgumentCollection( + Argument::createIntTypeArgument('id', null, true) + ); + } +} diff --git a/local/modules/LocalPickup/README.md b/local/modules/LocalPickup/README.md new file mode 100644 index 00000000..c01a932e --- /dev/null +++ b/local/modules/LocalPickup/README.md @@ -0,0 +1,101 @@ +LocalPickup module +================== +author: Thelia + +Summary +------- + +fr_FR: +1. Installation +2. Utilisation +3. Boucles +4. Intégration + +en_US: +1. Install notes +2. How to use +3. Loops +4. Integration + +fr_FR +----- + +### Installation + +#### Manually + +* Copiez le module dans le dossier ```/local/modules/``` et assurez-vous que le nom du module est bien LocalPickup. +* Activez le depuis votre interface d'administration Thelia. + +#### Composer + +Ajoutez le module à votre fichier composer.json principal : + +``` +composer require thelia/local-pickup-module:~1.0 +``` + +### Utilisation + +Pour utiliser le module de retrait sur place, allez dans le back-office, onglet Modules, et activez le, +puis cliquez sur "Configurer" sur la ligne du module. Renseignez le prix que vous souhaitez donner au retrait sur place +et enregistrez. + +### Boucles + +1. `address.local` + Même sorties que la boucle `address`, mais avec l'adresse du magasin au lieu de celle du client. + - Arguments: + 1. id | obligatoire | id de l'adresse du client + - Sorties: + Les mêmes variables que la boucle address, mais l'adresse donnée est celle du magasin. + - Utilisation: + ``` + {loop type="address.local" name="yourloopname" id="1"} + + {/loop}``` + +### Intégration + +L'integration utilise les hooks et ne nécessite pas de travaux particuliers. + +en_US +----- + +### Installation notes + +#### Manually + +* Copy the module into ```/local/modules/``` directory and be sure that the name of the module is LocalPickup. +* Activate it in your thelia administration panel + +#### Composer + +Add it in your main thelia composer.json file: + +``` +composer require thelia/local-pickup-module:~1.0 +``` + +### Usage + +To use the module, you first need to activate it in the back-office, tab Modules, and click on "Configure" on the line +of the module. Enter the price you want for local pickup and save. + +### Loops +1. `address.local` + Same output as the `address` loop, with the store adresse instead of the customer address. + - Arguments: + 1. id | mandatory | id of the customer's address + - Output: + The same variables as address loop, but the given address is the store's address. + - Usage: + ``` + {loop type="address.local" name="yourloopname" id="1"} + + {/loop} + ``` + +### Integration + +The modules uses hooks, and does not require specific work. diff --git a/local/modules/LocalPickup/composer.json b/local/modules/LocalPickup/composer.json new file mode 100644 index 00000000..5527cbf0 --- /dev/null +++ b/local/modules/LocalPickup/composer.json @@ -0,0 +1,11 @@ +{ + "name": "thelia/local-pickup-module", + "license": "LGPL-3.0+", + "type": "thelia-module", + "require": { + "thelia/installer": "~1.1" + }, + "extra": { + "installer-name": "LocalPickup" + } +} \ No newline at end of file diff --git a/local/modules/LocalPickup/templates/backOffice/default/module_configuration.html b/local/modules/LocalPickup/templates/backOffice/default/module_configuration.html new file mode 100644 index 00000000..abab6836 --- /dev/null +++ b/local/modules/LocalPickup/templates/backOffice/default/module_configuration.html @@ -0,0 +1,37 @@ +
+
+
+ {intl l='Configure local pickup price' d='localpickup.bo.default'} +
+ +
+
+ + {form name="localpickup.form"} + {if isset($smarty.get.errmes) and !empty($smarty.get.errmes)} +
+ {$smarty.get.errmes} +
+ {/if} + + {form_hidden_fields form=$form} + + {custom_render_form_field field="price"} +
+ + + {currency attr="symbol"} + +
+ {/custom_render_form_field} + +
+ {intl l="Close" d='localpickup.bo.default'} + +
+ {/form} + +
+
+
+
diff --git a/local/modules/LocalPickup/templates/frontOffice/default/localpickup/order-invoice-delivery-address.html b/local/modules/LocalPickup/templates/frontOffice/default/localpickup/order-invoice-delivery-address.html new file mode 100644 index 00000000..cabe86a9 --- /dev/null +++ b/local/modules/LocalPickup/templates/frontOffice/default/localpickup/order-invoice-delivery-address.html @@ -0,0 +1,25 @@ +
+ {loop type="address.local" name="local-delivery-address" id={order attr="delivery_address"}} +
{intl l="Retrait en magasin"}
+
+ {loop type="title" name="customer.title.info" id=$TITLE}{$SHORT}{/loop} {$LASTNAME|upper} {$FIRSTNAME|ucwords} + {$COMPANY} +
+ {$ADDRESS1}
+ {if $ADDRESS2 != ""} + {$ADDRESS2}
+ {/if} + {if $ADDRESS3 != ""} + {$ADDRESS3}
+ {/if} + {$ZIPCODE} + + {$CITY}, + {loop type="country" name="customer.country.info" id=$COUNTRY}{$TITLE}{/loop}{if $STATE}, + {loop type="state" name="customer.state.info" id=$STATE}{$TITLE}{/loop} + {/if} + +
+
+ {/loop} +
diff --git a/web/revslider/application/config/config.php b/web/revslider/application/config/config.php index b4629a10..d3b1be21 100644 --- a/web/revslider/application/config/config.php +++ b/web/revslider/application/config/config.php @@ -14,7 +14,7 @@ | path to your installation. | */ -$config['base_url'] = 'http://thecoredev.domokits:8888/revslider/'; +$config['base_url'] = 'https://www.light-domotique.fr/revslider/'; /* |-------------------------------------------------------------------------- diff --git a/web/revslider/application/config/database.php b/web/revslider/application/config/database.php index 49c5064b..9702037c 100644 --- a/web/revslider/application/config/database.php +++ b/web/revslider/application/config/database.php @@ -48,7 +48,7 @@ $active_group = 'default'; $active_record = TRUE; -$db['default']['hostname'] = 'localhost'; +$db['default']['hostname'] = 'beaheadfwhsofian.mysql.db'; $db['default']['username'] = 'beaheadfwhsofian'; $db['default']['password'] = 'Cerbonnus34'; $db['default']['database'] = 'beaheadfwhsofian'; diff --git a/web/revslider/revslider/public/assets/assets/svg/busy-icons-svg/flag.svg b/web/revslider/revslider/public/assets/assets/svg/busy-icons-svg/flag.svg index 7152870f..e3e80657 100644 --- a/web/revslider/revslider/public/assets/assets/svg/busy-icons-svg/flag.svg +++ b/web/revslider/revslider/public/assets/assets/svg/busy-icons-svg/flag.svg @@ -1 +1 @@ -6 \ No newline at end of file + \ No newline at end of file