diff --git a/core/lib/Thelia/Action/Order.php b/core/lib/Thelia/Action/Order.php index eea8b82b7..fde7404e1 100755 --- a/core/lib/Thelia/Action/Order.php +++ b/core/lib/Thelia/Action/Order.php @@ -221,6 +221,7 @@ class Order extends BaseAction implements EventSubscriberInterface ->setWeight($pse->getWeight()) ->setTaxRuleTitle($taxRuleI18n->getTitle()) ->setTaxRuleDescription($taxRuleI18n->getDescription()) + ->setEanCode($pse->getEanCode()) ; $orderProduct->setDispatcher($this->getDispatcher()); $orderProduct->save($con); diff --git a/core/lib/Thelia/Action/Product.php b/core/lib/Thelia/Action/Product.php index bd918c5e6..e82b92bf6 100644 --- a/core/lib/Thelia/Action/Product.php +++ b/core/lib/Thelia/Action/Product.php @@ -54,10 +54,10 @@ use Thelia\Core\Event\Product\ProductDeleteCategoryEvent; use Thelia\Core\Event\Product\ProductAddCategoryEvent; use Thelia\Model\AttributeAvQuery; use Thelia\Model\AttributeCombination; -use Thelia\Core\Event\Product\ProductCreateCombinationEvent; +use Thelia\Core\Event\Product\ProductSaleElementCreateEvent; use Propel\Runtime\Propel; use Thelia\Model\Map\ProductTableMap; -use Thelia\Core\Event\Product\ProductDeleteCombinationEvent; +use Thelia\Core\Event\Product\ProductSaleElementDeleteEvent; use Thelia\Model\ProductPrice; use Thelia\Model\ProductSaleElements; use Thelia\Core\Event\Product\ProductAddAccessoryEvent; @@ -85,8 +85,6 @@ class Product extends BaseAction implements EventSubscriberInterface // Set the default tax rule to this product ->setTaxRule(TaxRuleQuery::create()->findOneByIsDefault(true)) - //public function create($defaultCategoryId, $basePrice, $priceCurrencyId, $taxRuleId, $baseWeight) { - ->create( $event->getDefaultCategory(), $event->getBasePrice(), @@ -304,6 +302,11 @@ class Product extends BaseAction implements EventSubscriberInterface return $this->genericUpdatePosition(ProductAssociatedContentQuery::create(), $event); } + /** + * Update the value of a product feature. + * + * @param FeatureProductUpdateEvent $event + */ public function updateFeatureProductValue(FeatureProductUpdateEvent $event) { // If the feature is not free text, it may have one ore more values. @@ -346,6 +349,11 @@ class Product extends BaseAction implements EventSubscriberInterface $event->setFeatureProduct($featureProduct); } + /** + * Delete a product feature value + * + * @param FeatureProductDeleteEvent $event + */ public function deleteFeatureProductValue(FeatureProductDeleteEvent $event) { $featureProduct = FeatureProductQuery::create() @@ -355,76 +363,6 @@ class Product extends BaseAction implements EventSubscriberInterface ; } - public function createProductCombination(ProductCreateCombinationEvent $event) - { - $con = Propel::getWriteConnection(ProductTableMap::DATABASE_NAME); - - $con->beginTransaction(); - - try { - $product = $event->getProduct(); - - // Create an empty product sale element - $salesElement = new ProductSaleElements(); - - $salesElement - ->setProduct($product) - ->setRef($product->getRef()) - ->setPromo(0) - ->setNewness(0) - ->setWeight(0) - ->setIsDefault(false) - ->save($con) - ; - - // Create an empty product price in the default currency - $product_price = new ProductPrice(); - - $product_price - ->setProductSaleElements($salesElement) - ->setPromoPrice(0) - ->setPrice(0) - ->setCurrencyId($event->getCurrencyId()) - ->save($con) - ; - - $combinationAttributes = $event->getAttributeAvList(); - - if (count($combinationAttributes) > 0) { - - foreach ($combinationAttributes as $attributeAvId) { - - $attributeAv = AttributeAvQuery::create()->findPk($attributeAvId); - - if ($attributeAv !== null) { - $attributeCombination = new AttributeCombination(); - - $attributeCombination - ->setAttributeAvId($attributeAvId) - ->setAttribute($attributeAv->getAttribute()) - ->setProductSaleElements($salesElement) - ->save(); - } - } - } - - // Store all the stuff ! - $con->commit(); - } catch (\Exception $ex) { - - $con->rollback(); - - throw $ex; - } - } - - public function deleteProductCombination(ProductDeleteCombinationEvent $event) - { - if (null !== $pse = ProductSaleElementsQuery::create()->findPk($event->getProductSaleElementId())) { - $pse->delete(); - } - } - /** * {@inheritDoc} */ @@ -436,18 +374,15 @@ class Product extends BaseAction implements EventSubscriberInterface TheliaEvents::PRODUCT_DELETE => array("delete", 128), TheliaEvents::PRODUCT_TOGGLE_VISIBILITY => array("toggleVisibility", 128), - TheliaEvents::PRODUCT_UPDATE_POSITION => array("updatePosition", 128), + TheliaEvents::PRODUCT_UPDATE_POSITION => array("updatePosition", 128), TheliaEvents::PRODUCT_ADD_CONTENT => array("addContent", 128), TheliaEvents::PRODUCT_REMOVE_CONTENT => array("removeContent", 128), - TheliaEvents::PRODUCT_UPDATE_ACCESSORY_POSITION => array("updateAccessoryPosition", 128), TheliaEvents::PRODUCT_UPDATE_CONTENT_POSITION => array("updateContentPosition", 128), - TheliaEvents::PRODUCT_ADD_COMBINATION => array("createProductCombination", 128), - TheliaEvents::PRODUCT_DELETE_COMBINATION => array("deleteProductCombination", 128), - - TheliaEvents::PRODUCT_ADD_ACCESSORY => array("addAccessory", 128), - TheliaEvents::PRODUCT_REMOVE_ACCESSORY => array("removeAccessory", 128), + TheliaEvents::PRODUCT_ADD_ACCESSORY => array("addAccessory", 128), + TheliaEvents::PRODUCT_REMOVE_ACCESSORY => array("removeAccessory", 128), + TheliaEvents::PRODUCT_UPDATE_ACCESSORY_POSITION => array("updateAccessoryPosition", 128), TheliaEvents::PRODUCT_ADD_CATEGORY => array("addCategory", 128), TheliaEvents::PRODUCT_REMOVE_CATEGORY => array("removeCategory", 128), @@ -456,7 +391,6 @@ class Product extends BaseAction implements EventSubscriberInterface TheliaEvents::PRODUCT_FEATURE_UPDATE_VALUE => array("updateFeatureProductValue", 128), TheliaEvents::PRODUCT_FEATURE_DELETE_VALUE => array("deleteFeatureProductValue", 128), - ); } } diff --git a/core/lib/Thelia/Action/ProductSaleElement.php b/core/lib/Thelia/Action/ProductSaleElement.php new file mode 100644 index 000000000..730fe0764 --- /dev/null +++ b/core/lib/Thelia/Action/ProductSaleElement.php @@ -0,0 +1,232 @@ +. */ +/* */ +/*************************************************************************************/ + +namespace Thelia\Action; + +use Symfony\Component\EventDispatcher\EventSubscriberInterface; + +use Thelia\Model\ProductQuery; +use Thelia\Model\Product as ProductModel; + +use Thelia\Core\Event\TheliaEvents; +use Thelia\Core\Event\ProductSaleElement\ProductSaleElementCreateEvent; +use Thelia\Model\Map\ProductSaleElementsTableMap; +use Thelia\Model\ProductSaleElements; +use Thelia\Model\ProductPrice; +use Thelia\Model\AttributeCombination; +use Thelia\Core\Event\ProductSaleElement\ProductSaleElementDeleteEvent; +use Thelia\Model\ProductSaleElementsQuery; +use Thelia\Core\Event\ProductSaleElement\ProductSaleElementUpdateEvent; +use Thelia\Model\ProductPriceQuery; +use Propel\Runtime\Propel; +use Thelia\Model\AttributeAvQuery; +use Thelia\Model\Currency; +use Thelia\Model\Map\AttributeCombinationTableMap; +use Propel\Runtime\ActiveQuery\Criteria; + +class ProductSaleElement extends BaseAction implements EventSubscriberInterface +{ + /** + * Create a new product sale element, with or without combination + * + * @param ProductSaleElementCreateEvent $event + * @throws Exception + */ + public function create(ProductSaleElementCreateEvent $event) + { + $con = Propel::getWriteConnection(ProductSaleElementsTableMap::DATABASE_NAME); + + $con->beginTransaction(); + + try { + // Check if we have a PSE without combination, this is the "default" PSE. Attach the combination to this PSE + $salesElement = ProductSaleElementsQuery::create() + ->filterByProductId($event->getProduct()->getId()) + ->joinAttributeCombination(null, Criteria::LEFT_JOIN) + ->add(AttributeCombinationTableMap::PRODUCT_SALE_ELEMENTS_ID, null, Criteria::ISNULL) + ->findOne($con); + + if ($salesElement == null) { + // Create a new product sale element + $salesElement = $event->getProduct()->createDefaultProductSaleElement($con, 0, 0, $event->getCurrencyId(), true); + } + else { + // This one is the default + $salesElement->setIsDefault(true)->save($con); + } + + // Attach combination, if defined. + $combinationAttributes = $event->getAttributeAvList(); + + if (count($combinationAttributes) > 0) { + + foreach ($combinationAttributes as $attributeAvId) { + + $attributeAv = AttributeAvQuery::create()->findPk($attributeAvId); + + if ($attributeAv !== null) { + $attributeCombination = new AttributeCombination(); + + $attributeCombination + ->setAttributeAvId($attributeAvId) + ->setAttribute($attributeAv->getAttribute()) + ->setProductSaleElements($salesElement) + ->save(); + } + } + } + + // Store all the stuff ! + $con->commit(); + } + catch (\Exception $ex) { + + $con->rollback(); + + throw $ex; + } + } + + /** + * Update an existing product sale element + * + * @param ProductSaleElementUpdateEvent $event + */ + public function update(ProductSaleElementUpdateEvent $event) + { + $salesElement = ProductSaleElementsQuery::create()->findPk($event->getProductSaleElementId()); + + $con = Propel::getWriteConnection(ProductSaleElementsTableMap::DATABASE_NAME); + + $con->beginTransaction(); + + try { + + // If product sale element is not defined, create it. + if ($salesElement == null) { + $salesElement = new ProductSaleElements(); + + $salesElement->setProduct($event->getProduct()); + } + + // Update sale element + $salesElement + ->setRef($event->getReference()) + ->setQuantity($event->getQuantity()) + ->setPromo($event->getOnsale()) + ->setNewness($event->getIsnew()) + ->setWeight($event->getWeight()) + ->setIsDefault($event->getIsDefault()) + ->setEanCode($event->getEanCode()) + ->save() + ; + + // Update/create price for current currency + $productPrice = ProductPriceQuery::create() + ->filterByCurrencyId($event->getCurrencyId()) + ->filterByProductSaleElementsId($salesElement->getId()) + ->findOne($con); + + // If price is not defined, create it. + if ($productPrice == null) { + + $productPrice = new ProductPrice(); + + $productPrice + ->setProductSaleElements($salesElement) + ->setCurrencyId($event->getCurrencyId()) + ; + } + + $productPrice + ->setPromoPrice($event->getSalePrice()) + ->setPrice($event->getPrice()) + ->save($con) + ; + + // Store all the stuff ! + $con->commit(); + } + catch (\Exception $ex) { + + $con->rollback(); + + throw $ex; + } + } + + /** + * Delete a product sale element + * + * @param ProductSaleElementDeleteEvent $event + */ + public function delete(ProductSaleElementDeleteEvent $event) + { + if (null !== $pse = ProductSaleElementsQuery::create()->findPk($event->getProductSaleElementId())) { + + $product = $pse->getProduct(); + + $con = Propel::getWriteConnection(ProductSaleElementsTableMap::DATABASE_NAME); + + $con->beginTransaction(); + + try { + + $pse->delete($con); + + if ($product->countSaleElements() <= 0) { + // If we just deleted the last PSE, create a default one + $product->createDefaultProductSaleElement($con, 0, 0, $event->getCurrencyId(), true); + } + else if ($product->getDefaultSaleElements() == null) { + + // If we deleted the default PSE, make the last created one the default + $pse = ProductSaleElementsQuery::create()->filterByProductId($this->id)->orderByCreatedAt(Criteria::DESC)->findOne($con); + + $pse->setIsDefault(true)->save($con); + } + + // Store all the stuff ! + $con->commit(); + } + catch (\Exception $ex) { + + $con->rollback(); + + throw $ex; + } + } + } + + /** + * {@inheritDoc} + */ + public static function getSubscribedEvents() + { + return array( + TheliaEvents::PRODUCT_ADD_PRODUCT_SALE_ELEMENT => array("create", 128), + TheliaEvents::PRODUCT_UPDATE_PRODUCT_SALE_ELEMENT => array("update", 128), + TheliaEvents::PRODUCT_DELETE_PRODUCT_SALE_ELEMENT => array("delete", 128), + ); + } +} diff --git a/core/lib/Thelia/Config/Resources/action.xml b/core/lib/Thelia/Config/Resources/action.xml index 0aa44a7cc..1901edfec 100755 --- a/core/lib/Thelia/Config/Resources/action.xml +++ b/core/lib/Thelia/Config/Resources/action.xml @@ -51,6 +51,11 @@ + + + + + diff --git a/core/lib/Thelia/Config/Resources/config.xml b/core/lib/Thelia/Config/Resources/config.xml index 06f2acf48..4e019a55f 100755 --- a/core/lib/Thelia/Config/Resources/config.xml +++ b/core/lib/Thelia/Config/Resources/config.xml @@ -75,10 +75,12 @@
- + + + @@ -153,6 +155,7 @@ + diff --git a/core/lib/Thelia/Config/Resources/routing/admin.xml b/core/lib/Thelia/Config/Resources/routing/admin.xml index 8a6037844..df8c9e4df 100755 --- a/core/lib/Thelia/Config/Resources/routing/admin.xml +++ b/core/lib/Thelia/Config/Resources/routing/admin.xml @@ -303,6 +303,10 @@ Thelia\Controller\Admin\ProductController::updateContentPositionAction + + Thelia\Controller\Admin\ProductController::priceCaclulator + + @@ -349,19 +353,19 @@ - Thelia\Controller\Admin\ProductController::addCombinationAction + Thelia\Controller\Admin\ProductController::addProductSaleElementAction - Thelia\Controller\Admin\ProductController::deleteCombinationAction + Thelia\Controller\Admin\ProductController::deleteProductSaleElementAction - Thelia\Controller\Admin\ProductController::updateCombinationAction + Thelia\Controller\Admin\ProductController::updateProductSaleElementAction - Thelia\Controller\Admin\ProductController::updateDefaultPriceAction + Thelia\Controller\Admin\ProductController::updateProductDefaultSaleElementAction diff --git a/core/lib/Thelia/Controller/Admin/ProductController.php b/core/lib/Thelia/Controller/Admin/ProductController.php index 96a29de32..d56898662 100644 --- a/core/lib/Thelia/Controller/Admin/ProductController.php +++ b/core/lib/Thelia/Controller/Admin/ProductController.php @@ -48,6 +48,23 @@ use Thelia\Model\CategoryQuery; use Thelia\Core\Event\Product\ProductAddAccessoryEvent; use Thelia\Core\Event\Product\ProductDeleteAccessoryEvent; use Thelia\Model\ProductSaleElementsQuery; +use Thelia\Core\Event\ProductSaleElement\ProductSaleElementDeleteEvent; +use Thelia\Core\Event\ProductSaleElement\ProductSaleElementUpdateEvent; +use Thelia\Core\Event\ProductSaleElement\ProductSaleElementCreateEvent; +use Thelia\Model\AttributeQuery; +use Thelia\Model\AttributeAvQuery; +use Thelia\Form\ProductSaleElementUpdateForm; +use Thelia\Model\ProductSaleElements; +use Thelia\Model\ProductPriceQuery; +use Thelia\Form\ProductDefaultSaleElementUpdateForm; +use Thelia\Model\ProductPrice; +use Thelia\Model\Currency; +use Symfony\Component\HttpFoundation\JsonResponse; +use Thelia\TaxEngine\Calculator; +use Thelia\Model\Country; +use Thelia\Model\CountryQuery; +use Thelia\Model\TaxRuleQuery; +use Thelia\Tools\NumberFormat; /** * Manages products @@ -172,10 +189,58 @@ class ProductController extends AbstractCrudController protected function hydrateObjectForm($object) { - // Get the default produc sales element - $salesElement = ProductSaleElementsQuery::create()->filterByProduct($object)->filterByIsDefault(true)->findOne(); + $defaultPseData = $combinationPseData = array(); -// $prices = $salesElement->getProductPrices(); + // Find product's sale elements + $saleElements = ProductSaleElementsQuery::create() + ->filterByProduct($object) + ->find(); + + foreach($saleElements as $saleElement) { + + // Get the product price for the current currency + + $productPrice = ProductPriceQuery::create() + ->filterByCurrency($this->getCurrentEditionCurrency()) + ->filterByProductSaleElements($saleElement) + ->findOne() + ; + + if ($productPrice == null) $productPrice = new ProductPrice(); + + $isDefaultPse = count($saleElement->getAttributeCombinations()) == 0; + + // If this PSE has no combination -> this is the default one + // affect it to the thelia.admin.product_sale_element.update form + if ($isDefaultPse) { + + $defaultPseData = array( + "product_id" => $object->getId(), + "product_sale_element_id" => $saleElement->getId(), + "reference" => $saleElement->getRef(), + "price" => $productPrice->getPrice(), + "use_exchange_rate" => $productPrice->getFromDefaultCurrency() ? 1 : 0, + "tax_rule" => $object->getTaxRuleId(), + "currency" => $productPrice->getCurrencyId(), + "weight" => $saleElement->getWeight(), + "quantity" => $saleElement->getQuantity(), + "sale_price" => $productPrice->getPromoPrice(), + "onsale" => $saleElement->getPromo() > 0 ? 1 : 0, + "isnew" => $saleElement->getNewness() > 0 ? 1 : 0, + "isdefault" => $saleElement->getIsDefault() > 0 ? 1 : 0, + "ean_code" => $saleElement->getEanCode() + ); + + } + else { + } + + $defaultPseForm = new ProductDefaultSaleElementUpdateForm($this->getRequest(), "form", $defaultPseData); + $this->getParserContext()->addForm($defaultPseForm); + + $combinationPseForm = new ProductSaleElementUpdateForm($this->getRequest(), "form", $combinationPseData); + $this->getParserContext()->addForm($combinationPseForm); + } // Prepare the data that will hydrate the form $data = array( @@ -226,7 +291,7 @@ class ProductController extends AbstractCrudController 'product_id' => $this->getRequest()->get('product_id', 0), 'folder_id' => $this->getRequest()->get('folder_id', 0), 'accessory_category_id' => $this->getRequest()->get('accessory_category_id', 0), - 'current_tab' => $this->getRequest()->get('current_tab', 'general') + 'current_tab' => $this->getRequest()->get('current_tab', 'general') ); } @@ -730,20 +795,21 @@ class ProductController extends AbstractCrudController /** * A a new combination to a product */ - public function addCombinationAction() + public function addProductSaleElementAction() { // Check current user authorization if (null !== $response = $this->checkAuth($this->resourceCode, AccessManager::UPDATE)) return $response; - $event = new ProductCreateCombinationEvent( + $event = new ProductSaleElementCreateEvent( $this->getExistingObject(), $this->getRequest()->get('combination_attributes', array()), $this->getCurrentEditionCurrency()->getId() ); try { - $this->dispatch(TheliaEvents::PRODUCT_ADD_COMBINATION, $event); - } catch (\Exception $ex) { + $this->dispatch(TheliaEvents::PRODUCT_ADD_PRODUCT_SALE_ELEMENT, $event); + } + catch (\Exception $ex) { // Any error return $this->errorPage($ex); } @@ -751,23 +817,23 @@ class ProductController extends AbstractCrudController $this->redirectToEditionTemplate(); } - /** * A a new combination to a product */ - public function deleteCombinationAction() + public function deleteProductSaleElementAction() { // Check current user authorization if (null !== $response = $this->checkAuth($this->resourceCode, AccessManager::UPDATE)) return $response; - $event = new ProductDeleteCombinationEvent( - $this->getExistingObject(), - $this->getRequest()->get('product_sale_element_id',0) + $event = new ProductSaleElementDeleteEvent( + $this->getRequest()->get('product_sale_element_id',0), + $this->getCurrentEditionCurrency()->getId() ); try { - $this->dispatch(TheliaEvents::PRODUCT_DELETE_COMBINATION, $event); - } catch (\Exception $ex) { + $this->dispatch(TheliaEvents::PRODUCT_DELETE_PRODUCT_SALE_ELEMENT, $event); + } + catch (\Exception $ex) { // Any error return $this->errorPage($ex); } @@ -775,4 +841,124 @@ class ProductController extends AbstractCrudController $this->redirectToEditionTemplate(); } + /** + * Change a product sale element + */ + protected function processProductSaleElementUpdate($changeForm) { + + // Check current user authorization + if (null !== $response = $this->checkAuth("admin.products.update")) return $response; + + $error_msg = false; + + try { + + // Check the form against constraints violations + $form = $this->validateForm($changeForm, "POST"); + + // Get the form field values + $data = $form->getData(); + + $event = new ProductSaleElementUpdateEvent( + $this->getExistingObject(), + $data['product_sale_element_id'] + ); + + $event + ->setReference($data['reference']) + ->setPrice($data['price']) + ->setCurrencyId($data['currency']) + ->setWeight($data['weight']) + ->setQuantity($data['quantity']) + ->setSalePrice($data['sale_price']) + ->setOnsale($data['onsale']) + ->setIsnew($data['isnew']) + ->setIsdefault($data['isdefault']) + ->setEanCode($data['ean_code']) + ->setTaxrule($data['tax_rule']) + ; + + $this->dispatch(TheliaEvents::PRODUCT_UPDATE_PRODUCT_SALE_ELEMENT, $event); + + // Log object modification + if (null !== $changedObject = $event->getProductSaleElement()) { + $this->adminLogAppend(sprintf("Product Sale Element (ID %s) for product reference %s modified", $changedObject->getId(), $event->getProduct()->getRef())); + } + + // If we have to stay on the same page, do not redirect to the succesUrl, just redirect to the edit page again. + if ($this->getRequest()->get('save_mode') == 'stay') { + $this->redirectToEditionTemplate($this->getRequest()); + } + + // Redirect to the success URL + $this->redirect($changeForm->getSuccessUrl()); + } + catch (FormValidationException $ex) { + // Form cannot be validated + $error_msg = $this->createStandardFormValidationErrorMessage($ex); + } + catch (\Exception $ex) { + // Any other error + $error_msg = $ex->getMessage(); + } + + $this->setupFormErrorContext( + $this->getTranslator()->trans("ProductSaleElement modification"), $error_msg, $changeForm, $ex); + + // At this point, the form has errors, and should be redisplayed. + return $this->renderEditionTemplate(); + } + + /** + * Change a product sale element attached to a combination + */ + public function updateProductSaleElementAction() { + return $this->processProductSaleElementUpdate( + new ProductSaleElementUpdateForm($this->getRequest()) + ); + } + + /** + * Update default product sale element (not attached to any combination) + */ + public function updateProductDefaultSaleElementAction() { + + return $this->processProductSaleElementUpdate( + new ProductDefaultSaleElementUpdateForm($this->getRequest()) + ); + } + + public function priceCaclulator() { + + $price = floatval($this->getRequest()->get('price', 0)); + $tax_rule = intval($this->getRequest()->get('tax_rule_id', 0)); // The tax rule ID + $action = $this->getRequest()->get('action', ''); // With ot without tax + $convert = intval($this->getRequest()->get('convert_from_default_currency', 0)); + + $calc = new Calculator(); + + $calc->loadTaxRule( + TaxRuleQuery::create()->findPk($tax_rule), + Country::getShopLocation() + ); + + if ($action == 'to_tax') { + $return_price = $calc->getTaxedPrice($price); + } + else if ($action == 'from_tax') { + $return_price = $calc->getUntaxedPrice($price); + } + else { + $return_price = $price; + } + + if ($convert != 0) { + $return_price = $prix * Currency::getDefaultCurrency()->getRate(); + } + + // Format the number using '.', to perform further calculation + $return_price = NumberFormat::getInstance($this->getRequest())->format($return_price, null, '.'); + + return new JsonResponse(array('result' => $return_price)); + } } diff --git a/core/lib/Thelia/Controller/Admin/TestController.php b/core/lib/Thelia/Controller/Admin/TestController.php new file mode 100644 index 000000000..5fbdb58e8 --- /dev/null +++ b/core/lib/Thelia/Controller/Admin/TestController.php @@ -0,0 +1,93 @@ +. */ +/* */ +/*************************************************************************************/ + +namespace Thelia\Controller\Admin; + +use Thelia\Form\TestForm; +/** + * Manages variables + * + * @author Franck Allimant + */ +class TestController extends BaseAdminController +{ + /** + * Load a object for modification, and display the edit template. + * + * @return Symfony\Component\HttpFoundation\Response the response + */ + public function updateAction() + { + // Prepare the data that will hydrate the form + $data = array( + 'title' => "test title", + 'test' => array('a', 'b', 'toto' => 'c') + ); + + // Setup the object form + $changeForm = new TestForm($this->getRequest(), "form", $data); + + // Pass it to the parser + $this->getParserContext()->addForm($changeForm); + + return $this->render('test-form'); + } + + /** + * Save changes on a modified object, and either go back to the object list, or stay on the edition page. + * + * @return Symfony\Component\HttpFoundation\Response the response + */ + public function processUpdateAction() + { + $error_msg = false; + + // Create the form from the request + $changeForm = new TestForm($this->getRequest()); + + try { + + // Check the form against constraints violations + $form = $this->validateForm($changeForm, "POST"); + + // Get the form field values + $data = $form->getData(); + + echo "data="; + + var_dump($data); + } + catch (FormValidationException $ex) { + // Form cannot be validated + $error_msg = $this->createStandardFormValidationErrorMessage($ex); + } + catch (\Exception $ex) { + // Any other error + $error_msg = $ex->getMessage(); + } + + echo "Error = $error_msg"; + + exit; + } +} \ No newline at end of file diff --git a/core/lib/Thelia/Controller/BaseController.php b/core/lib/Thelia/Controller/BaseController.php index 959b7ff0e..066958025 100755 --- a/core/lib/Thelia/Controller/BaseController.php +++ b/core/lib/Thelia/Controller/BaseController.php @@ -162,8 +162,12 @@ class BaseController extends ContainerAware } foreach ($form->all() as $child) { + if (!$child->isValid()) { - $errors .= $this->getErrorMessages($child) . ', '; + + $fieldName = $child->getConfig()->getOption('label', $child->getName()); + + $errors .= sprintf("[%s] %s, ", $fieldName, $this->getErrorMessages($child)); } } @@ -192,13 +196,15 @@ class BaseController extends ContainerAware $errorMessage = null; if ($form->get("error_message")->getData() != null) { $errorMessage = $form->get("error_message")->getData(); - } else { + } + else { $errorMessage = sprintf("Missing or invalid data: %s", $this->getErrorMessages($form)); } throw new FormValidationException($errorMessage); } - } else { + } + else { throw new FormValidationException(sprintf("Wrong form method, %s expected.", $expectedMethod)); } } @@ -223,7 +229,8 @@ class BaseController extends ContainerAware { if ($form != null) { $url = $form->getSuccessUrl(); - } else { + } + else { $url = $this->getRequest()->get("success_url"); } diff --git a/core/lib/Thelia/Core/Event/Product/ProductCreateCombinationEvent.php b/core/lib/Thelia/Core/Event/ProductSaleElement/ProductSaleElementCreateEvent.php similarity index 82% rename from core/lib/Thelia/Core/Event/Product/ProductCreateCombinationEvent.php rename to core/lib/Thelia/Core/Event/ProductSaleElement/ProductSaleElementCreateEvent.php index 1af473aeb..721342bd8 100644 --- a/core/lib/Thelia/Core/Event/Product/ProductCreateCombinationEvent.php +++ b/core/lib/Thelia/Core/Event/ProductSaleElement/ProductSaleElementCreateEvent.php @@ -21,21 +21,24 @@ /* */ /*************************************************************************************/ -namespace Thelia\Core\Event\Product; +namespace Thelia\Core\Event\ProductSaleElement; use Thelia\Model\Product; +use Thelia\Core\Event\Product\ProductEvent; -class ProductCreateCombinationEvent extends ProductEvent +class ProductSaleElementCreateEvent extends ProductSaleElementEvent { + protected $product; protected $attribute_av_list; protected $currency_id; public function __construct(Product $product, $attribute_av_list, $currency_id) { - parent::__construct($product); + parent::__construct(); - $this->attribute_av_list = $attribute_av_list; - $this->currency_id = $currency_id; + $this->setAttributeAvList($attribute_av_list); + $this->setCurrencyId($currency_id); + $this->setProduct($product); } public function getAttributeAvList() @@ -62,4 +65,15 @@ class ProductCreateCombinationEvent extends ProductEvent return $this; } + public function getProduct() { + return $this->product; + } + + public function setProduct($product) { + $this->product = $product; + + return $this; + } + + } diff --git a/core/lib/Thelia/Core/Event/Product/ProductDeleteCombinationEvent.php b/core/lib/Thelia/Core/Event/ProductSaleElement/ProductSaleElementDeleteEvent.php similarity index 79% rename from core/lib/Thelia/Core/Event/Product/ProductDeleteCombinationEvent.php rename to core/lib/Thelia/Core/Event/ProductSaleElement/ProductSaleElementDeleteEvent.php index a4e926ee6..291d59ac9 100644 --- a/core/lib/Thelia/Core/Event/Product/ProductDeleteCombinationEvent.php +++ b/core/lib/Thelia/Core/Event/ProductSaleElement/ProductSaleElementDeleteEvent.php @@ -21,19 +21,21 @@ /* */ /*************************************************************************************/ -namespace Thelia\Core\Event\Product; - +namespace Thelia\Core\Event\ProductSaleElement; use Thelia\Model\Product; +use Thelia\Core\Event\Product\ProductEvent; -class ProductDeleteCombinationEvent extends ProductEvent +class ProductSaleElementDeleteEvent extends ProductSaleElementEvent { protected $product_sale_element_id; + protected $currency_id; - public function __construct(Product $product, $product_sale_element_id) + public function __construct($product_sale_element_id, $currency_id) { - parent::__construct($product); + parent::__construct(); $this->product_sale_element_id = $product_sale_element_id; + $this->setCurrencyId($currency_id); } public function getProductSaleElementId() @@ -44,5 +46,19 @@ class ProductDeleteCombinationEvent extends ProductEvent public function setProductSaleElementId($product_sale_element_id) { $this->product_sale_element_id = $product_sale_element_id; + + return $this; } + + public function getCurrencyId() + { + return $this->currency_id; + } + + public function setCurrencyId($currency_id) + { + $this->currency_id = $currency_id; + return $this; + } + } diff --git a/core/lib/Thelia/Core/Event/ProductSaleElement/ProductSaleElementEvent.php b/core/lib/Thelia/Core/Event/ProductSaleElement/ProductSaleElementEvent.php new file mode 100644 index 000000000..a99b2cfe7 --- /dev/null +++ b/core/lib/Thelia/Core/Event/ProductSaleElement/ProductSaleElementEvent.php @@ -0,0 +1,54 @@ +. */ +/* */ +/*************************************************************************************/ + +namespace Thelia\Core\Event\ProductSaleElement; + +use Thelia\Model\ProductSaleElement; +use Thelia\Core\Event\ActionEvent; + +class ProductSaleElementEvent extends ActionEvent +{ + public $product_sale_element = null; + + public function __construct(ProductSaleElement $product_sale_element = null) + { + $this->product_sale_element = $product_sale_element; + } + + public function hasProductSaleElement() + { + return ! is_null($this->product_sale_element); + } + + public function getProductSaleElement() + { + return $this->product_sale_element; + } + + public function setProductSaleElement(ProductSaleElement $product_sale_element) + { + $this->product_sale_element = $product_sale_element; + + return $this; + } +} diff --git a/core/lib/Thelia/Core/Event/ProductSaleElement/ProductSaleElementUpdateEvent.php b/core/lib/Thelia/Core/Event/ProductSaleElement/ProductSaleElementUpdateEvent.php new file mode 100644 index 000000000..a3eed8a2a --- /dev/null +++ b/core/lib/Thelia/Core/Event/ProductSaleElement/ProductSaleElementUpdateEvent.php @@ -0,0 +1,211 @@ +. */ +/* */ +/*************************************************************************************/ + +namespace Thelia\Core\Event\ProductSaleElement; +use Thelia\Core\Event\Product\ProductCreateEvent; +use Thelia\Model\Product; +use Thelia\Core\Event\Product\ProductEvent; + +class ProductSaleElementUpdateEvent extends ProductSaleElementEvent +{ + protected $product_sale_element_id; + + protected $product; + protected $reference; + protected $price; + protected $currency_id; + protected $weight; + protected $quantity; + protected $sale_price; + protected $onsale; + protected $isnew; + protected $isdefault; + protected $ean_code; + protected $taxrule; + + public function __construct(Product $product, $product_sale_element_id) + { + parent::__construct(); + + $this->setProduct($product); + + $this->setProductSaleElementId($product_sale_element_id); + } + + public function getProductSaleElementId() + { + return $this->product_sale_element_id; + } + + public function setProductSaleElementId($product_sale_element_id) + { + $this->product_sale_element_id = $product_sale_element_id; + + return $this; + } + + public function getPrice() + { + return $this->price; + } + + public function setPrice($price) + { + $this->price = $price; + + return $this; + } + + public function getCurrencyId() + { + return $this->currency_id; + } + + public function setCurrencyId($currency_id) + { + $this->currency_id = $currency_id; + + return $this; + } + + public function getWeight() + { + return $this->weight; + } + + public function setWeight($weight) + { + $this->weight = $weight; + + return $this; + } + + public function getQuantity() + { + return $this->quantity; + } + + public function setQuantity($quantity) + { + $this->quantity = $quantity; + + return $this; + } + + public function getSalePrice() + { + return $this->sale_price; + } + + public function setSalePrice($sale_price) + { + $this->sale_price = $sale_price; + + return $this; + } + + public function getOnsale() + { + return $this->onsale; + } + + public function setOnsale($onsale) + { + $this->onsale = $onsale; + + return $this; + } + + public function getIsnew() + { + return $this->isnew; + } + + public function setIsnew($isnew) + { + $this->isnew = $isnew; + + return $this; + } + + public function getEanCode() + { + return $this->ean_code; + } + + public function setEanCode($ean_code) + { + $this->ean_code = $ean_code; + + return $this; + } + + public function getIsdefault() + { + return $this->isdefault; + } + + public function setIsdefault($isdefault) + { + $this->isdefault = $isdefault; + + return $this; + } + + public function getReference() + { + return $this->reference; + } + + public function setReference($reference) + { + $this->reference = $reference; + + return $this; + } + + public function getProduct() + { + return $this->product; + } + + public function setProduct($product) + { + $this->product = $product; + + return $this; + } + + public function getTaxrule() + { + return $this->taxrule; + } + + public function setTaxrule($taxrule) + { + $this->taxrule = $taxrule; + + return $this; + } + +} diff --git a/core/lib/Thelia/Core/Event/TheliaEvents.php b/core/lib/Thelia/Core/Event/TheliaEvents.php index 8327cc3c3..c4cf8326e 100755 --- a/core/lib/Thelia/Core/Event/TheliaEvents.php +++ b/core/lib/Thelia/Core/Event/TheliaEvents.php @@ -255,14 +255,14 @@ final class TheliaEvents // -- Categories Associated Content ---------------------------------------- - const BEFORE_CREATECATEGORY_ASSOCIATED_CONTENT = "action.before_createCategoryAssociatedContent"; - const AFTER_CREATECATEGORY_ASSOCIATED_CONTENT = "action.after_createCategoryAssociatedContent"; + const BEFORE_CREATECATEGORY_ASSOCIATED_CONTENT = "action.before_createCategoryAssociatedContent"; + const AFTER_CREATECATEGORY_ASSOCIATED_CONTENT = "action.after_createCategoryAssociatedContent"; - const BEFORE_DELETECATEGORY_ASSOCIATED_CONTENT = "action.before_deleteCategoryAssociatedContent"; - const AFTER_DELETECATEGORY_ASSOCIATED_CONTENT = "action.after_deleteCategoryAssociatedContent"; + const BEFORE_DELETECATEGORY_ASSOCIATED_CONTENT = "action.before_deleteCategoryAssociatedContent"; + const AFTER_DELETECATEGORY_ASSOCIATED_CONTENT = "action.after_deleteCategoryAssociatedContent"; - const BEFORE_UPDATECATEGORY_ASSOCIATED_CONTENT = "action.before_updateCategoryAssociatedContent"; - const AFTER_UPDATECATEGORY_ASSOCIATED_CONTENT = "action.after_updateCategoryAssociatedContent"; + const BEFORE_UPDATECATEGORY_ASSOCIATED_CONTENT = "action.before_updateCategoryAssociatedContent"; + const AFTER_UPDATECATEGORY_ASSOCIATED_CONTENT = "action.after_updateCategoryAssociatedContent"; // -- Product management ----------------------------------------------- @@ -276,8 +276,9 @@ final class TheliaEvents const PRODUCT_REMOVE_CONTENT = "action.productRemoveContent"; const PRODUCT_UPDATE_CONTENT_POSITION = "action.updateProductContentPosition"; - const PRODUCT_ADD_COMBINATION = "action.productAddCombination"; - const PRODUCT_DELETE_COMBINATION = "action.productDeleteCombination"; + const PRODUCT_ADD_PRODUCT_SALE_ELEMENT = "action.addProductSaleElement"; + const PRODUCT_DELETE_PRODUCT_SALE_ELEMENT = "action.deleteProductSaleElement"; + const PRODUCT_UPDATE_PRODUCT_SALE_ELEMENT = "action.updateProductSaleElement"; const PRODUCT_SET_TEMPLATE = "action.productSetTemplate"; diff --git a/core/lib/Thelia/Core/Template/Loop/Country.php b/core/lib/Thelia/Core/Template/Loop/Country.php index a44e49277..87e45cb47 100755 --- a/core/lib/Thelia/Core/Template/Loop/Country.php +++ b/core/lib/Thelia/Core/Template/Loop/Country.php @@ -113,13 +113,13 @@ class Country extends BaseI18nLoop ->set("CHAPO", $country->getVirtualColumn('i18n_CHAPO')) ->set("DESCRIPTION", $country->getVirtualColumn('i18n_DESCRIPTION')) ->set("POSTSCRIPTUM", $country->getVirtualColumn('i18n_POSTSCRIPTUM')) - ->set("IS_DEFAULT", $country->getByDefault() === 1 ? "1" : "0") ->set("ISOCODE", $country->getIsocode()) ->set("ISOALPHA2", $country->getIsoalpha2()) ->set("ISOALPHA3", $country->getIsoalpha3()) - ->set('IS_DEFAULT', $country->getByDefault()) + ->set("IS_DEFAULT", $country->getByDefault() ? "1" : "0") + ->set("IS_SHOP_COUNTRY", $country->getShopCountry() ? "1" : "0") + ; - ; $loopResult->addRow($loopResultRow); } diff --git a/core/lib/Thelia/Core/Template/Loop/OrderProduct.php b/core/lib/Thelia/Core/Template/Loop/OrderProduct.php index ab1fa2ab1..f12bbed70 100755 --- a/core/lib/Thelia/Core/Template/Loop/OrderProduct.php +++ b/core/lib/Thelia/Core/Template/Loop/OrderProduct.php @@ -108,6 +108,7 @@ class OrderProduct extends BaseLoop ->set("TAX_RULE_TITLE", $product->getTaxRuleTitle()) ->set("TAX_RULE_DESCRIPTION", $product->getTaxRuledescription()) ->set("PARENT", $product->getParent()) + ->set("EAN_CODE", $product->getEanCode()) ; $loopResult->addRow($loopResultRow); diff --git a/core/lib/Thelia/Core/Template/Loop/ProductSaleElements.php b/core/lib/Thelia/Core/Template/Loop/ProductSaleElements.php index aa71d2b3c..29d56b149 100755 --- a/core/lib/Thelia/Core/Template/Loop/ProductSaleElements.php +++ b/core/lib/Thelia/Core/Template/Loop/ProductSaleElements.php @@ -177,6 +177,7 @@ class ProductSaleElements extends BaseLoop ->set("IS_NEW" , $PSEValue->getNewness() === 1 ? 1 : 0) ->set("IS_DEFAULT" , $PSEValue->getIsDefault() === 1 ? 1 : 0) ->set("WEIGHT" , $PSEValue->getWeight()) + ->set("EAN_CODE" , $PSEValue->getEanCode()) ->set("PRICE" , $price) ->set("PRICE_TAX" , $taxedPrice - $price) ->set("TAXED_PRICE" , $taxedPrice) diff --git a/core/lib/Thelia/Core/Template/Smarty/Plugins/Form.php b/core/lib/Thelia/Core/Template/Smarty/Plugins/Form.php index 385597ced..8539796b0 100755 --- a/core/lib/Thelia/Core/Template/Smarty/Plugins/Form.php +++ b/core/lib/Thelia/Core/Template/Smarty/Plugins/Form.php @@ -22,9 +22,6 @@ /*************************************************************************************/ namespace Thelia\Core\Template\Smarty\Plugins; -use Symfony\Component\Form\Extension\Core\Type\ChoiceType; -use Symfony\Component\Form\Extension\Core\Type\CollectionType; -use Symfony\Component\Form\Extension\Core\View\ChoiceView; use Symfony\Component\Form\FormView; use Thelia\Core\Form\Type\TheliaType; use Thelia\Form\BaseForm; @@ -33,6 +30,9 @@ use Symfony\Component\HttpFoundation\Request; use Thelia\Core\Template\Smarty\SmartyPluginDescriptor; use Thelia\Core\Template\Smarty\AbstractSmartyPlugin; use Thelia\Core\Template\ParserContext; +use Symfony\Component\Form\Extension\Core\Type\ChoiceType; +use Symfony\Component\Form\Extension\Core\Type\CollectionType; +use Symfony\Component\Form\Extension\Core\View\ChoiceView; /** * @@ -78,8 +78,8 @@ class Form extends AbstractSmartyPlugin { foreach ($formDefinition as $name => $className) { if (array_key_exists($name, $this->formDefinition)) { - throw new \InvalidArgumentException(sprintf("%s form name already exists for %s class", $name, - $className)); + throw new \InvalidArgumentException( + sprintf("%s form name already exists for %s class", $name, $className)); } $this->formDefinition[$name] = $className; @@ -113,7 +113,8 @@ class Form extends AbstractSmartyPlugin $template->assign("form_error", $instance->hasError() ? true : false); $template->assign("form_error_message", $instance->getErrorMessage()); - } else { + } + else { return $content; } } @@ -139,7 +140,7 @@ class Form extends AbstractSmartyPlugin $template->assign("error", empty($errors) ? false : true); - if (! empty($errors)) { + if (!empty($errors)) { $this->assignFieldErrorVars($template, $errors); } @@ -205,30 +206,37 @@ class Form extends AbstractSmartyPlugin $this->assignFormTypeValues($template, $formFieldConfig, $formFieldView); $value = $formFieldView->vars["value"]; -/* FIXME: doesnt work. We got "This form should not contain extra fields." error. -// We have a collection -if (is_array($value)) { -$key = $this->getParam($params, 'value_key'); + // We have a collection + if (count($formFieldView->children) > 0) { -if ($key != null) { + $key = $this->getParam($params, 'value_key'); -if (isset($value[$key])) { + if ($key != null) { -$name = sprintf("%s[%s]", $formFieldView->vars["full_name"], $key); -$val = $value[$key]; + if (isset($value[$key])) { -$this->assignFieldValues($template, $name, $val, $formFieldView->vars); -} -} -} else { -$this->assignFieldValues($template, $formFieldView->vars["full_name"], $fieldVars["value"], $formFieldView->vars); -} -*/ - $this->assignFieldValues($template, $formFieldView->vars["full_name"], $formFieldView->vars["value"], $formFieldView->vars); + $name = sprintf("%s[%s]", $formFieldView->vars["full_name"], $key); + + $val = $value[$key]; + + $this->assignFieldValues($template, $name, $val, $formFieldView->vars); + } + else { + throw new \LogicException(sprintf("Cannot find a value for key '%s' in field '%s'", $key, $formFieldView->vars["name"])); + } + } + else { + throw new \InvalidArgumentException(sprintf("Missing or empty parameter 'value_key' for field '%s'", $formFieldView->vars["name"])); + } + } + else { + $this->assignFieldValues($template, $formFieldView->vars["full_name"], $formFieldView->vars["value"], $formFieldView->vars); + } $formFieldView->setRendered(); - } else { + } + else { return $content; } } @@ -300,7 +308,7 @@ $this->assignFieldValues($template, $formFieldView->vars["full_name"], $fieldVar $formView = $instance->getView(); if ($formView->vars["multipart"]) { - return sprintf('%s="%s"',"enctype", "multipart/form-data"); + return sprintf('%s="%s"', "enctype", "multipart/form-data"); } } @@ -316,7 +324,8 @@ $this->assignFieldValues($template, $formFieldView->vars["full_name"], $fieldVar if ($repeat) { $this->assignFieldErrorVars($template, $errors); - } else { + } + else { return $content; } } @@ -339,11 +348,10 @@ $this->assignFieldValues($template, $formFieldView->vars["full_name"], $fieldVar $fieldName = $this->getParam($params, 'field'); - if (null == $fieldName) - throw new \InvalidArgumentException("'field' parameter is missing"); + if (null == $fieldName) throw new \InvalidArgumentException("'field' parameter is missing"); - if (empty($instance->getView()[$fieldName])) - throw new \InvalidArgumentException(sprintf("Field name '%s' not found in form %s", $fieldName, $instance->getName())); + if (empty($instance->getView()[$fieldName])) throw new \InvalidArgumentException( + sprintf("Field name '%s' not found in form %s", $fieldName, $instance->getName())); return $instance->getView()[$fieldName]; } @@ -398,8 +406,10 @@ $this->assignFieldValues($template, $formFieldView->vars["full_name"], $fieldVar throw new \InvalidArgumentException("Missing 'form' parameter in form arguments"); } - if (! $instance instanceof \Thelia\Form\BaseForm) { - throw new \InvalidArgumentException(sprintf("form parameter in form_field block must be an instance of + if (!$instance instanceof \Thelia\Form\BaseForm) { + throw new \InvalidArgumentException( + sprintf( + "form parameter in form_field block must be an instance of \Thelia\Form\BaseForm, instance of %s found", get_class($instance))); } @@ -414,10 +424,7 @@ $this->assignFieldValues($template, $formFieldView->vars["full_name"], $fieldVar $class = new \ReflectionClass($this->formDefinition[$name]); - return $class->newInstance( - $this->request, - "form" - ); + return $class->newInstance($this->request, "form"); } /** diff --git a/core/lib/Thelia/Core/Template/Smarty/Plugins/Format.php b/core/lib/Thelia/Core/Template/Smarty/Plugins/Format.php index 536eb2a4e..01491e6fd 100644 --- a/core/lib/Thelia/Core/Template/Smarty/Plugins/Format.php +++ b/core/lib/Thelia/Core/Template/Smarty/Plugins/Format.php @@ -28,6 +28,7 @@ use Thelia\Core\Template\Smarty\AbstractSmartyPlugin; use Thelia\Core\Template\Smarty\Exception\SmartyPluginException; use Thelia\Core\Template\Smarty\SmartyPluginDescriptor; use Thelia\Tools\DateTimeFormat; +use Thelia\Tools\NumberFormat; /** * @@ -69,21 +70,20 @@ class Format extends AbstractSmartyPlugin */ public function formatDate($params, $template = null) { + $date = $this->getParam($params, "date", false); - if (array_key_exists("date", $params) === false) { + if ($date === false) { throw new SmartyPluginException("date is a mandatory parameter in format_date function"); } - $date = $params["date"]; - if (!$date instanceof \DateTime) { return ""; } - if (array_key_exists("format", $params)) { - $format = $params["format"]; - } else { - $format = DateTimeFormat::getInstance($this->request)->getFormat(array_key_exists("output", $params) ? $params["output"] : null); + $format = $this->getParam($params, "format", false); + + if ($format === false) { + $format = DateTimeFormat::getInstance($this->request)->getFormat($this->getParam($params, "output", null)); } return $date->format($format); @@ -109,23 +109,22 @@ class Format extends AbstractSmartyPlugin */ public function formatNumber($params, $template = null) { - if (array_key_exists("number", $params) === false) { + $number = $this->getParam($params, "number", false); + + if ($number === false) { throw new SmartyPluginException("number is a mandatory parameter in format_number function"); } - $number = $params["number"]; - - if (empty($number)) { + if ($number == '') { return ""; } - $lang = $this->request->getSession()->getLang(); - - $decimals = array_key_exists("decimals", $params) ? $params["decimals"] : $lang->getDecimals(); - $decPoint = array_key_exists("dec_point", $params) ? $params["dec_point"] : $lang->getDecimalSeparator(); - $thousandsSep = array_key_exists("thousands_sep", $params) ? $params["thousands_sep"] : $lang->getThousandsSeparator(); - - return number_format($number, $decimals, $decPoint, $thousandsSep); + return NumberFormat::getInstance($this->request)->format( + $number, + $this->getParam($params, "decimals", null), + $this->getParam($params, "dec_point", null), + $this->getParam($params, "thousands_sep", null) + ); } /** diff --git a/core/lib/Thelia/Form/ProductDefaultSaleElementUpdateForm.php b/core/lib/Thelia/Form/ProductDefaultSaleElementUpdateForm.php new file mode 100644 index 000000000..807f8ac07 --- /dev/null +++ b/core/lib/Thelia/Form/ProductDefaultSaleElementUpdateForm.php @@ -0,0 +1,31 @@ +. */ +/* */ +/*************************************************************************************/ +namespace Thelia\Form; + +class ProductDefaultSaleElementUpdateForm extends ProductSaleElementUpdateForm +{ + public function getName() + { + return "thelia_product_default_sale_element_update_form"; + } +} diff --git a/core/lib/Thelia/Form/ProductDetailsModificationForm.php b/core/lib/Thelia/Form/ProductSaleElementUpdateForm.php similarity index 71% rename from core/lib/Thelia/Form/ProductDetailsModificationForm.php rename to core/lib/Thelia/Form/ProductSaleElementUpdateForm.php index dbc6bb238..e3a74a755 100644 --- a/core/lib/Thelia/Form/ProductDetailsModificationForm.php +++ b/core/lib/Thelia/Form/ProductSaleElementUpdateForm.php @@ -25,28 +25,33 @@ namespace Thelia\Form; use Symfony\Component\Validator\Constraints\GreaterThan; use Thelia\Core\Translation\Translator; use Symfony\Component\Validator\Constraints\NotBlank; +use Thelia\Model\Currency; -class ProductDetailsModificationForm extends BaseForm +class ProductSaleElementUpdateForm extends BaseForm { use StandardDescriptionFieldsTrait; protected function buildForm() { $this->formBuilder - ->add("id", "integer", array( - "label" => Translator::getInstance()->trans("Prodcut ID *"), - "label_attr" => array("for" => "product_id_field"), - "constraints" => array(new GreaterThan(array('value' => 0))) + ->add("product_id", "integer", array( + "label" => Translator::getInstance()->trans("Product ID *"), + "label_attr" => array("for" => "product_id_field"), + "constraints" => array(new GreaterThan(array('value' => 0))) + )) + ->add("product_sale_element_id", "integer", array( + "label" => Translator::getInstance()->trans("Product sale element ID *"), + "label_attr" => array("for" => "product_sale_element_id_field") + )) + ->add("reference", "text", array( + "label" => Translator::getInstance()->trans("Reference *"), + "label_attr" => array("for" => "reference_field") )) ->add("price", "number", array( "constraints" => array(new NotBlank()), - "label" => Translator::getInstance()->trans("Product base price excluding taxes *"), + "label" => Translator::getInstance()->trans("Product price excluding taxes *"), "label_attr" => array("for" => "price_field") )) - ->add("price_with_tax", "number", array( - "label" => Translator::getInstance()->trans("Product base price including taxes *"), - "label_attr" => array("for" => "price_with_tax_field") - )) ->add("currency", "integer", array( "constraints" => array(new NotBlank()), "label" => Translator::getInstance()->trans("Price currency *"), @@ -64,11 +69,11 @@ class ProductDetailsModificationForm extends BaseForm )) ->add("quantity", "number", array( "constraints" => array(new NotBlank()), - "label" => Translator::getInstance()->trans("Current quantity *"), + "label" => Translator::getInstance()->trans("Available quantity *"), "label_attr" => array("for" => "quantity_field") )) ->add("sale_price", "number", array( - "label" => Translator::getInstance()->trans("Sale price *"), + "label" => Translator::getInstance()->trans("Sale price without taxes *"), "label_attr" => array("for" => "price_with_tax_field") )) ->add("onsale", "integer", array( @@ -79,12 +84,23 @@ class ProductDetailsModificationForm extends BaseForm "label" => Translator::getInstance()->trans("Advertise this product as new"), "label_attr" => array("for" => "isnew_field") )) - + ->add("isdefault", "integer", array( + "label" => Translator::getInstance()->trans("Is it the default product sale element ?"), + "label_attr" => array("for" => "isdefault_field") + )) + ->add("ean_code", "integer", array( + "label" => Translator::getInstance()->trans("EAN Code"), + "label_attr" => array("for" => "ean_code_field") + )) + ->add("use_exchange_rate", "integer", array( + "label" => Translator::getInstance()->trans("Apply exchange rates on price in %sym", array("%sym" => Currency::getDefaultCurrency()->getSymbol())), + "label_attr" => array("for" => "use_exchange_rate_field") + )) ; } public function getName() { - return "thelia_product_details_modification"; + return "thelia_product_sale_element_update_form"; } } diff --git a/core/lib/Thelia/Model/Base/Country.php b/core/lib/Thelia/Model/Base/Country.php index eb8312369..299b3e511 100644 --- a/core/lib/Thelia/Model/Base/Country.php +++ b/core/lib/Thelia/Model/Base/Country.php @@ -95,10 +95,18 @@ abstract class Country implements ActiveRecordInterface /** * The value for the by_default field. + * Note: this column has a database default value of: 0 * @var int */ protected $by_default; + /** + * The value for the shop_country field. + * Note: this column has a database default value of: false + * @var boolean + */ + protected $shop_country; + /** * The value for the created_at field. * @var string @@ -174,11 +182,25 @@ abstract class Country implements ActiveRecordInterface */ protected $countryI18nsScheduledForDeletion = null; + /** + * Applies default values to this object. + * This method should be called from the object's constructor (or + * equivalent initialization method). + * @see __construct() + */ + public function applyDefaultValues() + { + $this->by_default = 0; + $this->shop_country = false; + } + /** * Initializes internal state of Thelia\Model\Base\Country object. + * @see applyDefaults() */ public function __construct() { + $this->applyDefaultValues(); } /** @@ -498,6 +520,17 @@ abstract class Country implements ActiveRecordInterface return $this->by_default; } + /** + * Get the [shop_country] column value. + * + * @return boolean + */ + public function getShopCountry() + { + + return $this->shop_country; + } + /** * Get the [optionally formatted] temporal [created_at] column value. * @@ -668,6 +701,35 @@ abstract class Country implements ActiveRecordInterface return $this; } // setByDefault() + /** + * Sets the value of the [shop_country] column. + * Non-boolean arguments are converted using the following rules: + * * 1, '1', 'true', 'on', and 'yes' are converted to boolean true + * * 0, '0', 'false', 'off', and 'no' are converted to boolean false + * Check on string values is case insensitive (so 'FaLsE' is seen as 'false'). + * + * @param boolean|integer|string $v The new value + * @return \Thelia\Model\Country The current object (for fluent API support) + */ + public function setShopCountry($v) + { + if ($v !== null) { + if (is_string($v)) { + $v = in_array(strtolower($v), array('false', 'off', '-', 'no', 'n', '0', '')) ? false : true; + } else { + $v = (boolean) $v; + } + } + + if ($this->shop_country !== $v) { + $this->shop_country = $v; + $this->modifiedColumns[] = CountryTableMap::SHOP_COUNTRY; + } + + + return $this; + } // setShopCountry() + /** * Sets the value of [created_at] column to a normalized version of the date/time value specified. * @@ -720,6 +782,14 @@ abstract class Country implements ActiveRecordInterface */ public function hasOnlyDefaultValues() { + if ($this->by_default !== 0) { + return false; + } + + if ($this->shop_country !== false) { + return false; + } + // otherwise, everything was equal, so return TRUE return true; } // hasOnlyDefaultValues() @@ -765,13 +835,16 @@ abstract class Country implements ActiveRecordInterface $col = $row[TableMap::TYPE_NUM == $indexType ? 5 + $startcol : CountryTableMap::translateFieldName('ByDefault', TableMap::TYPE_PHPNAME, $indexType)]; $this->by_default = (null !== $col) ? (int) $col : null; - $col = $row[TableMap::TYPE_NUM == $indexType ? 6 + $startcol : CountryTableMap::translateFieldName('CreatedAt', TableMap::TYPE_PHPNAME, $indexType)]; + $col = $row[TableMap::TYPE_NUM == $indexType ? 6 + $startcol : CountryTableMap::translateFieldName('ShopCountry', TableMap::TYPE_PHPNAME, $indexType)]; + $this->shop_country = (null !== $col) ? (boolean) $col : null; + + $col = $row[TableMap::TYPE_NUM == $indexType ? 7 + $startcol : CountryTableMap::translateFieldName('CreatedAt', TableMap::TYPE_PHPNAME, $indexType)]; if ($col === '0000-00-00 00:00:00') { $col = null; } $this->created_at = (null !== $col) ? PropelDateTime::newInstance($col, null, '\DateTime') : null; - $col = $row[TableMap::TYPE_NUM == $indexType ? 7 + $startcol : CountryTableMap::translateFieldName('UpdatedAt', TableMap::TYPE_PHPNAME, $indexType)]; + $col = $row[TableMap::TYPE_NUM == $indexType ? 8 + $startcol : CountryTableMap::translateFieldName('UpdatedAt', TableMap::TYPE_PHPNAME, $indexType)]; if ($col === '0000-00-00 00:00:00') { $col = null; } @@ -784,7 +857,7 @@ abstract class Country implements ActiveRecordInterface $this->ensureConsistency(); } - return $startcol + 8; // 8 = CountryTableMap::NUM_HYDRATE_COLUMNS. + return $startcol + 9; // 9 = CountryTableMap::NUM_HYDRATE_COLUMNS. } catch (Exception $e) { throw new PropelException("Error populating \Thelia\Model\Country object", 0, $e); @@ -1095,6 +1168,9 @@ abstract class Country implements ActiveRecordInterface if ($this->isColumnModified(CountryTableMap::BY_DEFAULT)) { $modifiedColumns[':p' . $index++] = 'BY_DEFAULT'; } + if ($this->isColumnModified(CountryTableMap::SHOP_COUNTRY)) { + $modifiedColumns[':p' . $index++] = 'SHOP_COUNTRY'; + } if ($this->isColumnModified(CountryTableMap::CREATED_AT)) { $modifiedColumns[':p' . $index++] = 'CREATED_AT'; } @@ -1130,6 +1206,9 @@ abstract class Country implements ActiveRecordInterface case 'BY_DEFAULT': $stmt->bindValue($identifier, $this->by_default, PDO::PARAM_INT); break; + case 'SHOP_COUNTRY': + $stmt->bindValue($identifier, (int) $this->shop_country, PDO::PARAM_INT); + break; case 'CREATED_AT': $stmt->bindValue($identifier, $this->created_at ? $this->created_at->format("Y-m-d H:i:s") : null, PDO::PARAM_STR); break; @@ -1217,9 +1296,12 @@ abstract class Country implements ActiveRecordInterface return $this->getByDefault(); break; case 6: - return $this->getCreatedAt(); + return $this->getShopCountry(); break; case 7: + return $this->getCreatedAt(); + break; + case 8: return $this->getUpdatedAt(); break; default: @@ -1257,8 +1339,9 @@ abstract class Country implements ActiveRecordInterface $keys[3] => $this->getIsoalpha2(), $keys[4] => $this->getIsoalpha3(), $keys[5] => $this->getByDefault(), - $keys[6] => $this->getCreatedAt(), - $keys[7] => $this->getUpdatedAt(), + $keys[6] => $this->getShopCountry(), + $keys[7] => $this->getCreatedAt(), + $keys[8] => $this->getUpdatedAt(), ); $virtualColumns = $this->virtualColumns; foreach ($virtualColumns as $key => $virtualColumn) { @@ -1331,9 +1414,12 @@ abstract class Country implements ActiveRecordInterface $this->setByDefault($value); break; case 6: - $this->setCreatedAt($value); + $this->setShopCountry($value); break; case 7: + $this->setCreatedAt($value); + break; + case 8: $this->setUpdatedAt($value); break; } // switch() @@ -1366,8 +1452,9 @@ abstract class Country implements ActiveRecordInterface if (array_key_exists($keys[3], $arr)) $this->setIsoalpha2($arr[$keys[3]]); if (array_key_exists($keys[4], $arr)) $this->setIsoalpha3($arr[$keys[4]]); if (array_key_exists($keys[5], $arr)) $this->setByDefault($arr[$keys[5]]); - if (array_key_exists($keys[6], $arr)) $this->setCreatedAt($arr[$keys[6]]); - if (array_key_exists($keys[7], $arr)) $this->setUpdatedAt($arr[$keys[7]]); + if (array_key_exists($keys[6], $arr)) $this->setShopCountry($arr[$keys[6]]); + if (array_key_exists($keys[7], $arr)) $this->setCreatedAt($arr[$keys[7]]); + if (array_key_exists($keys[8], $arr)) $this->setUpdatedAt($arr[$keys[8]]); } /** @@ -1385,6 +1472,7 @@ abstract class Country implements ActiveRecordInterface if ($this->isColumnModified(CountryTableMap::ISOALPHA2)) $criteria->add(CountryTableMap::ISOALPHA2, $this->isoalpha2); if ($this->isColumnModified(CountryTableMap::ISOALPHA3)) $criteria->add(CountryTableMap::ISOALPHA3, $this->isoalpha3); if ($this->isColumnModified(CountryTableMap::BY_DEFAULT)) $criteria->add(CountryTableMap::BY_DEFAULT, $this->by_default); + if ($this->isColumnModified(CountryTableMap::SHOP_COUNTRY)) $criteria->add(CountryTableMap::SHOP_COUNTRY, $this->shop_country); if ($this->isColumnModified(CountryTableMap::CREATED_AT)) $criteria->add(CountryTableMap::CREATED_AT, $this->created_at); if ($this->isColumnModified(CountryTableMap::UPDATED_AT)) $criteria->add(CountryTableMap::UPDATED_AT, $this->updated_at); @@ -1455,6 +1543,7 @@ abstract class Country implements ActiveRecordInterface $copyObj->setIsoalpha2($this->getIsoalpha2()); $copyObj->setIsoalpha3($this->getIsoalpha3()); $copyObj->setByDefault($this->getByDefault()); + $copyObj->setShopCountry($this->getShopCountry()); $copyObj->setCreatedAt($this->getCreatedAt()); $copyObj->setUpdatedAt($this->getUpdatedAt()); @@ -2359,10 +2448,12 @@ abstract class Country implements ActiveRecordInterface $this->isoalpha2 = null; $this->isoalpha3 = null; $this->by_default = null; + $this->shop_country = null; $this->created_at = null; $this->updated_at = null; $this->alreadyInSave = false; $this->clearAllReferences(); + $this->applyDefaultValues(); $this->resetModified(); $this->setNew(true); $this->setDeleted(false); diff --git a/core/lib/Thelia/Model/Base/CountryQuery.php b/core/lib/Thelia/Model/Base/CountryQuery.php index 5e60f1821..9135e293a 100644 --- a/core/lib/Thelia/Model/Base/CountryQuery.php +++ b/core/lib/Thelia/Model/Base/CountryQuery.php @@ -28,6 +28,7 @@ use Thelia\Model\Map\CountryTableMap; * @method ChildCountryQuery orderByIsoalpha2($order = Criteria::ASC) Order by the isoalpha2 column * @method ChildCountryQuery orderByIsoalpha3($order = Criteria::ASC) Order by the isoalpha3 column * @method ChildCountryQuery orderByByDefault($order = Criteria::ASC) Order by the by_default column + * @method ChildCountryQuery orderByShopCountry($order = Criteria::ASC) Order by the shop_country column * @method ChildCountryQuery orderByCreatedAt($order = Criteria::ASC) Order by the created_at column * @method ChildCountryQuery orderByUpdatedAt($order = Criteria::ASC) Order by the updated_at column * @@ -37,6 +38,7 @@ use Thelia\Model\Map\CountryTableMap; * @method ChildCountryQuery groupByIsoalpha2() Group by the isoalpha2 column * @method ChildCountryQuery groupByIsoalpha3() Group by the isoalpha3 column * @method ChildCountryQuery groupByByDefault() Group by the by_default column + * @method ChildCountryQuery groupByShopCountry() Group by the shop_country column * @method ChildCountryQuery groupByCreatedAt() Group by the created_at column * @method ChildCountryQuery groupByUpdatedAt() Group by the updated_at column * @@ -69,6 +71,7 @@ use Thelia\Model\Map\CountryTableMap; * @method ChildCountry findOneByIsoalpha2(string $isoalpha2) Return the first ChildCountry filtered by the isoalpha2 column * @method ChildCountry findOneByIsoalpha3(string $isoalpha3) Return the first ChildCountry filtered by the isoalpha3 column * @method ChildCountry findOneByByDefault(int $by_default) Return the first ChildCountry filtered by the by_default column + * @method ChildCountry findOneByShopCountry(boolean $shop_country) Return the first ChildCountry filtered by the shop_country column * @method ChildCountry findOneByCreatedAt(string $created_at) Return the first ChildCountry filtered by the created_at column * @method ChildCountry findOneByUpdatedAt(string $updated_at) Return the first ChildCountry filtered by the updated_at column * @@ -78,6 +81,7 @@ use Thelia\Model\Map\CountryTableMap; * @method array findByIsoalpha2(string $isoalpha2) Return ChildCountry objects filtered by the isoalpha2 column * @method array findByIsoalpha3(string $isoalpha3) Return ChildCountry objects filtered by the isoalpha3 column * @method array findByByDefault(int $by_default) Return ChildCountry objects filtered by the by_default column + * @method array findByShopCountry(boolean $shop_country) Return ChildCountry objects filtered by the shop_country column * @method array findByCreatedAt(string $created_at) Return ChildCountry objects filtered by the created_at column * @method array findByUpdatedAt(string $updated_at) Return ChildCountry objects filtered by the updated_at column * @@ -168,7 +172,7 @@ abstract class CountryQuery extends ModelCriteria */ protected function findPkSimple($key, $con) { - $sql = 'SELECT ID, AREA_ID, ISOCODE, ISOALPHA2, ISOALPHA3, BY_DEFAULT, CREATED_AT, UPDATED_AT FROM country WHERE ID = :p0'; + $sql = 'SELECT ID, AREA_ID, ISOCODE, ISOALPHA2, ISOALPHA3, BY_DEFAULT, SHOP_COUNTRY, CREATED_AT, UPDATED_AT FROM country WHERE ID = :p0'; try { $stmt = $con->prepare($sql); $stmt->bindValue(':p0', $key, PDO::PARAM_INT); @@ -469,6 +473,33 @@ abstract class CountryQuery extends ModelCriteria return $this->addUsingAlias(CountryTableMap::BY_DEFAULT, $byDefault, $comparison); } + /** + * Filter the query on the shop_country column + * + * Example usage: + * + * $query->filterByShopCountry(true); // WHERE shop_country = true + * $query->filterByShopCountry('yes'); // WHERE shop_country = true + * + * + * @param boolean|string $shopCountry The value to use as filter. + * Non-boolean arguments are converted using the following rules: + * * 1, '1', 'true', 'on', and 'yes' are converted to boolean true + * * 0, '0', 'false', 'off', and 'no' are converted to boolean false + * Check on string values is case insensitive (so 'FaLsE' is seen as 'false'). + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * + * @return ChildCountryQuery The current query, for fluid interface + */ + public function filterByShopCountry($shopCountry = null, $comparison = null) + { + if (is_string($shopCountry)) { + $shop_country = in_array(strtolower($shopCountry), array('false', 'off', '-', 'no', 'n', '0', '')) ? false : true; + } + + return $this->addUsingAlias(CountryTableMap::SHOP_COUNTRY, $shopCountry, $comparison); + } + /** * Filter the query on the created_at column * diff --git a/core/lib/Thelia/Model/Base/ProductPrice.php b/core/lib/Thelia/Model/Base/ProductPrice.php index dc177ad1b..363244e07 100644 --- a/core/lib/Thelia/Model/Base/ProductPrice.php +++ b/core/lib/Thelia/Model/Base/ProductPrice.php @@ -82,6 +82,13 @@ abstract class ProductPrice implements ActiveRecordInterface */ protected $promo_price; + /** + * The value for the from_default_currency field. + * Note: this column has a database default value of: false + * @var boolean + */ + protected $from_default_currency; + /** * The value for the created_at field. * @var string @@ -112,11 +119,24 @@ abstract class ProductPrice implements ActiveRecordInterface */ protected $alreadyInSave = false; + /** + * Applies default values to this object. + * This method should be called from the object's constructor (or + * equivalent initialization method). + * @see __construct() + */ + public function applyDefaultValues() + { + $this->from_default_currency = false; + } + /** * Initializes internal state of Thelia\Model\Base\ProductPrice object. + * @see applyDefaults() */ public function __construct() { + $this->applyDefaultValues(); } /** @@ -414,6 +434,17 @@ abstract class ProductPrice implements ActiveRecordInterface return $this->promo_price; } + /** + * Get the [from_default_currency] column value. + * + * @return boolean + */ + public function getFromDefaultCurrency() + { + + return $this->from_default_currency; + } + /** * Get the [optionally formatted] temporal [created_at] column value. * @@ -546,6 +577,35 @@ abstract class ProductPrice implements ActiveRecordInterface return $this; } // setPromoPrice() + /** + * Sets the value of the [from_default_currency] column. + * Non-boolean arguments are converted using the following rules: + * * 1, '1', 'true', 'on', and 'yes' are converted to boolean true + * * 0, '0', 'false', 'off', and 'no' are converted to boolean false + * Check on string values is case insensitive (so 'FaLsE' is seen as 'false'). + * + * @param boolean|integer|string $v The new value + * @return \Thelia\Model\ProductPrice The current object (for fluent API support) + */ + public function setFromDefaultCurrency($v) + { + if ($v !== null) { + if (is_string($v)) { + $v = in_array(strtolower($v), array('false', 'off', '-', 'no', 'n', '0', '')) ? false : true; + } else { + $v = (boolean) $v; + } + } + + if ($this->from_default_currency !== $v) { + $this->from_default_currency = $v; + $this->modifiedColumns[] = ProductPriceTableMap::FROM_DEFAULT_CURRENCY; + } + + + return $this; + } // setFromDefaultCurrency() + /** * Sets the value of [created_at] column to a normalized version of the date/time value specified. * @@ -598,6 +658,10 @@ abstract class ProductPrice implements ActiveRecordInterface */ public function hasOnlyDefaultValues() { + if ($this->from_default_currency !== false) { + return false; + } + // otherwise, everything was equal, so return TRUE return true; } // hasOnlyDefaultValues() @@ -637,13 +701,16 @@ abstract class ProductPrice implements ActiveRecordInterface $col = $row[TableMap::TYPE_NUM == $indexType ? 3 + $startcol : ProductPriceTableMap::translateFieldName('PromoPrice', TableMap::TYPE_PHPNAME, $indexType)]; $this->promo_price = (null !== $col) ? (double) $col : null; - $col = $row[TableMap::TYPE_NUM == $indexType ? 4 + $startcol : ProductPriceTableMap::translateFieldName('CreatedAt', TableMap::TYPE_PHPNAME, $indexType)]; + $col = $row[TableMap::TYPE_NUM == $indexType ? 4 + $startcol : ProductPriceTableMap::translateFieldName('FromDefaultCurrency', TableMap::TYPE_PHPNAME, $indexType)]; + $this->from_default_currency = (null !== $col) ? (boolean) $col : null; + + $col = $row[TableMap::TYPE_NUM == $indexType ? 5 + $startcol : ProductPriceTableMap::translateFieldName('CreatedAt', TableMap::TYPE_PHPNAME, $indexType)]; if ($col === '0000-00-00 00:00:00') { $col = null; } $this->created_at = (null !== $col) ? PropelDateTime::newInstance($col, null, '\DateTime') : null; - $col = $row[TableMap::TYPE_NUM == $indexType ? 5 + $startcol : ProductPriceTableMap::translateFieldName('UpdatedAt', TableMap::TYPE_PHPNAME, $indexType)]; + $col = $row[TableMap::TYPE_NUM == $indexType ? 6 + $startcol : ProductPriceTableMap::translateFieldName('UpdatedAt', TableMap::TYPE_PHPNAME, $indexType)]; if ($col === '0000-00-00 00:00:00') { $col = null; } @@ -656,7 +723,7 @@ abstract class ProductPrice implements ActiveRecordInterface $this->ensureConsistency(); } - return $startcol + 6; // 6 = ProductPriceTableMap::NUM_HYDRATE_COLUMNS. + return $startcol + 7; // 7 = ProductPriceTableMap::NUM_HYDRATE_COLUMNS. } catch (Exception $e) { throw new PropelException("Error populating \Thelia\Model\ProductPrice object", 0, $e); @@ -911,6 +978,9 @@ abstract class ProductPrice implements ActiveRecordInterface if ($this->isColumnModified(ProductPriceTableMap::PROMO_PRICE)) { $modifiedColumns[':p' . $index++] = 'PROMO_PRICE'; } + if ($this->isColumnModified(ProductPriceTableMap::FROM_DEFAULT_CURRENCY)) { + $modifiedColumns[':p' . $index++] = 'FROM_DEFAULT_CURRENCY'; + } if ($this->isColumnModified(ProductPriceTableMap::CREATED_AT)) { $modifiedColumns[':p' . $index++] = 'CREATED_AT'; } @@ -940,6 +1010,9 @@ abstract class ProductPrice implements ActiveRecordInterface case 'PROMO_PRICE': $stmt->bindValue($identifier, $this->promo_price, PDO::PARAM_STR); break; + case 'FROM_DEFAULT_CURRENCY': + $stmt->bindValue($identifier, (int) $this->from_default_currency, PDO::PARAM_INT); + break; case 'CREATED_AT': $stmt->bindValue($identifier, $this->created_at ? $this->created_at->format("Y-m-d H:i:s") : null, PDO::PARAM_STR); break; @@ -1014,9 +1087,12 @@ abstract class ProductPrice implements ActiveRecordInterface return $this->getPromoPrice(); break; case 4: - return $this->getCreatedAt(); + return $this->getFromDefaultCurrency(); break; case 5: + return $this->getCreatedAt(); + break; + case 6: return $this->getUpdatedAt(); break; default: @@ -1052,8 +1128,9 @@ abstract class ProductPrice implements ActiveRecordInterface $keys[1] => $this->getCurrencyId(), $keys[2] => $this->getPrice(), $keys[3] => $this->getPromoPrice(), - $keys[4] => $this->getCreatedAt(), - $keys[5] => $this->getUpdatedAt(), + $keys[4] => $this->getFromDefaultCurrency(), + $keys[5] => $this->getCreatedAt(), + $keys[6] => $this->getUpdatedAt(), ); $virtualColumns = $this->virtualColumns; foreach ($virtualColumns as $key => $virtualColumn) { @@ -1114,9 +1191,12 @@ abstract class ProductPrice implements ActiveRecordInterface $this->setPromoPrice($value); break; case 4: - $this->setCreatedAt($value); + $this->setFromDefaultCurrency($value); break; case 5: + $this->setCreatedAt($value); + break; + case 6: $this->setUpdatedAt($value); break; } // switch() @@ -1147,8 +1227,9 @@ abstract class ProductPrice implements ActiveRecordInterface if (array_key_exists($keys[1], $arr)) $this->setCurrencyId($arr[$keys[1]]); if (array_key_exists($keys[2], $arr)) $this->setPrice($arr[$keys[2]]); if (array_key_exists($keys[3], $arr)) $this->setPromoPrice($arr[$keys[3]]); - if (array_key_exists($keys[4], $arr)) $this->setCreatedAt($arr[$keys[4]]); - if (array_key_exists($keys[5], $arr)) $this->setUpdatedAt($arr[$keys[5]]); + if (array_key_exists($keys[4], $arr)) $this->setFromDefaultCurrency($arr[$keys[4]]); + if (array_key_exists($keys[5], $arr)) $this->setCreatedAt($arr[$keys[5]]); + if (array_key_exists($keys[6], $arr)) $this->setUpdatedAt($arr[$keys[6]]); } /** @@ -1164,6 +1245,7 @@ abstract class ProductPrice implements ActiveRecordInterface if ($this->isColumnModified(ProductPriceTableMap::CURRENCY_ID)) $criteria->add(ProductPriceTableMap::CURRENCY_ID, $this->currency_id); if ($this->isColumnModified(ProductPriceTableMap::PRICE)) $criteria->add(ProductPriceTableMap::PRICE, $this->price); if ($this->isColumnModified(ProductPriceTableMap::PROMO_PRICE)) $criteria->add(ProductPriceTableMap::PROMO_PRICE, $this->promo_price); + if ($this->isColumnModified(ProductPriceTableMap::FROM_DEFAULT_CURRENCY)) $criteria->add(ProductPriceTableMap::FROM_DEFAULT_CURRENCY, $this->from_default_currency); if ($this->isColumnModified(ProductPriceTableMap::CREATED_AT)) $criteria->add(ProductPriceTableMap::CREATED_AT, $this->created_at); if ($this->isColumnModified(ProductPriceTableMap::UPDATED_AT)) $criteria->add(ProductPriceTableMap::UPDATED_AT, $this->updated_at); @@ -1240,6 +1322,7 @@ abstract class ProductPrice implements ActiveRecordInterface $copyObj->setCurrencyId($this->getCurrencyId()); $copyObj->setPrice($this->getPrice()); $copyObj->setPromoPrice($this->getPromoPrice()); + $copyObj->setFromDefaultCurrency($this->getFromDefaultCurrency()); $copyObj->setCreatedAt($this->getCreatedAt()); $copyObj->setUpdatedAt($this->getUpdatedAt()); if ($makeNew) { @@ -1380,10 +1463,12 @@ abstract class ProductPrice implements ActiveRecordInterface $this->currency_id = null; $this->price = null; $this->promo_price = null; + $this->from_default_currency = null; $this->created_at = null; $this->updated_at = null; $this->alreadyInSave = false; $this->clearAllReferences(); + $this->applyDefaultValues(); $this->resetModified(); $this->setNew(true); $this->setDeleted(false); diff --git a/core/lib/Thelia/Model/Base/ProductPriceQuery.php b/core/lib/Thelia/Model/Base/ProductPriceQuery.php index 9790d00ef..1ea364459 100644 --- a/core/lib/Thelia/Model/Base/ProductPriceQuery.php +++ b/core/lib/Thelia/Model/Base/ProductPriceQuery.php @@ -25,6 +25,7 @@ use Thelia\Model\Map\ProductPriceTableMap; * @method ChildProductPriceQuery orderByCurrencyId($order = Criteria::ASC) Order by the currency_id column * @method ChildProductPriceQuery orderByPrice($order = Criteria::ASC) Order by the price column * @method ChildProductPriceQuery orderByPromoPrice($order = Criteria::ASC) Order by the promo_price column + * @method ChildProductPriceQuery orderByFromDefaultCurrency($order = Criteria::ASC) Order by the from_default_currency column * @method ChildProductPriceQuery orderByCreatedAt($order = Criteria::ASC) Order by the created_at column * @method ChildProductPriceQuery orderByUpdatedAt($order = Criteria::ASC) Order by the updated_at column * @@ -32,6 +33,7 @@ use Thelia\Model\Map\ProductPriceTableMap; * @method ChildProductPriceQuery groupByCurrencyId() Group by the currency_id column * @method ChildProductPriceQuery groupByPrice() Group by the price column * @method ChildProductPriceQuery groupByPromoPrice() Group by the promo_price column + * @method ChildProductPriceQuery groupByFromDefaultCurrency() Group by the from_default_currency column * @method ChildProductPriceQuery groupByCreatedAt() Group by the created_at column * @method ChildProductPriceQuery groupByUpdatedAt() Group by the updated_at column * @@ -54,6 +56,7 @@ use Thelia\Model\Map\ProductPriceTableMap; * @method ChildProductPrice findOneByCurrencyId(int $currency_id) Return the first ChildProductPrice filtered by the currency_id column * @method ChildProductPrice findOneByPrice(double $price) Return the first ChildProductPrice filtered by the price column * @method ChildProductPrice findOneByPromoPrice(double $promo_price) Return the first ChildProductPrice filtered by the promo_price column + * @method ChildProductPrice findOneByFromDefaultCurrency(boolean $from_default_currency) Return the first ChildProductPrice filtered by the from_default_currency column * @method ChildProductPrice findOneByCreatedAt(string $created_at) Return the first ChildProductPrice filtered by the created_at column * @method ChildProductPrice findOneByUpdatedAt(string $updated_at) Return the first ChildProductPrice filtered by the updated_at column * @@ -61,6 +64,7 @@ use Thelia\Model\Map\ProductPriceTableMap; * @method array findByCurrencyId(int $currency_id) Return ChildProductPrice objects filtered by the currency_id column * @method array findByPrice(double $price) Return ChildProductPrice objects filtered by the price column * @method array findByPromoPrice(double $promo_price) Return ChildProductPrice objects filtered by the promo_price column + * @method array findByFromDefaultCurrency(boolean $from_default_currency) Return ChildProductPrice objects filtered by the from_default_currency column * @method array findByCreatedAt(string $created_at) Return ChildProductPrice objects filtered by the created_at column * @method array findByUpdatedAt(string $updated_at) Return ChildProductPrice objects filtered by the updated_at column * @@ -151,7 +155,7 @@ abstract class ProductPriceQuery extends ModelCriteria */ protected function findPkSimple($key, $con) { - $sql = 'SELECT PRODUCT_SALE_ELEMENTS_ID, CURRENCY_ID, PRICE, PROMO_PRICE, CREATED_AT, UPDATED_AT FROM product_price WHERE PRODUCT_SALE_ELEMENTS_ID = :p0 AND CURRENCY_ID = :p1'; + $sql = 'SELECT PRODUCT_SALE_ELEMENTS_ID, CURRENCY_ID, PRICE, PROMO_PRICE, FROM_DEFAULT_CURRENCY, CREATED_AT, UPDATED_AT FROM product_price WHERE PRODUCT_SALE_ELEMENTS_ID = :p0 AND CURRENCY_ID = :p1'; try { $stmt = $con->prepare($sql); $stmt->bindValue(':p0', $key[0], PDO::PARAM_INT); @@ -420,6 +424,33 @@ abstract class ProductPriceQuery extends ModelCriteria return $this->addUsingAlias(ProductPriceTableMap::PROMO_PRICE, $promoPrice, $comparison); } + /** + * Filter the query on the from_default_currency column + * + * Example usage: + * + * $query->filterByFromDefaultCurrency(true); // WHERE from_default_currency = true + * $query->filterByFromDefaultCurrency('yes'); // WHERE from_default_currency = true + * + * + * @param boolean|string $fromDefaultCurrency The value to use as filter. + * Non-boolean arguments are converted using the following rules: + * * 1, '1', 'true', 'on', and 'yes' are converted to boolean true + * * 0, '0', 'false', 'off', and 'no' are converted to boolean false + * Check on string values is case insensitive (so 'FaLsE' is seen as 'false'). + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * + * @return ChildProductPriceQuery The current query, for fluid interface + */ + public function filterByFromDefaultCurrency($fromDefaultCurrency = null, $comparison = null) + { + if (is_string($fromDefaultCurrency)) { + $from_default_currency = in_array(strtolower($fromDefaultCurrency), array('false', 'off', '-', 'no', 'n', '0', '')) ? false : true; + } + + return $this->addUsingAlias(ProductPriceTableMap::FROM_DEFAULT_CURRENCY, $fromDefaultCurrency, $comparison); + } + /** * Filter the query on the created_at column * diff --git a/core/lib/Thelia/Model/Country.php b/core/lib/Thelia/Model/Country.php index d30f2d281..5646496da 100755 --- a/core/lib/Thelia/Model/Country.php +++ b/core/lib/Thelia/Model/Country.php @@ -8,7 +8,9 @@ use Propel\Runtime\Propel; use Thelia\Core\Event\Country\CountryEvent; use Thelia\Core\Event\TheliaEvents; use Thelia\Model\Base\Country as BaseCountry; + use Thelia\Model\Map\CountryTableMap; +use Thelia\Core\Translation\Translator; class Country extends BaseCountry { @@ -79,4 +81,31 @@ class Country extends BaseCountry $this->dispatchEvent(TheliaEvents::AFTER_DELETECOUNTRY, new CountryEvent($this)); } + /** + * Return the default country + * + * @throws LogicException if no default country is defined + */ + public static function getDefaultCountry() { + $dc = CountryQuery::create()->findOneByByDefault(true); + + if ($dc == null) + throw new \LogicException(Translator::getInstance()->trans("Cannot find a default country. Please define one.")); + + return $dc; + } + + /** + * Return the shop country + * + * @throws LogicException if no shop country is defined + */ + public static function getShopLocation() { + $dc = CountryQuery::create()->findOneByShopCountry(true); + + if ($dc == null) + throw new \LogicException(Translator::getInstance()->trans("Cannot find the shop country. Please select a shop country.")); + + return $dc; + } } diff --git a/core/lib/Thelia/Model/Map/CountryTableMap.php b/core/lib/Thelia/Model/Map/CountryTableMap.php index 752f2b34a..d1f1a8a18 100644 --- a/core/lib/Thelia/Model/Map/CountryTableMap.php +++ b/core/lib/Thelia/Model/Map/CountryTableMap.php @@ -57,7 +57,7 @@ class CountryTableMap extends TableMap /** * The total number of columns */ - const NUM_COLUMNS = 8; + const NUM_COLUMNS = 9; /** * The number of lazy-loaded columns @@ -67,7 +67,7 @@ class CountryTableMap extends TableMap /** * The number of columns to hydrate (NUM_COLUMNS - NUM_LAZY_LOAD_COLUMNS) */ - const NUM_HYDRATE_COLUMNS = 8; + const NUM_HYDRATE_COLUMNS = 9; /** * the column name for the ID field @@ -99,6 +99,11 @@ class CountryTableMap extends TableMap */ const BY_DEFAULT = 'country.BY_DEFAULT'; + /** + * the column name for the SHOP_COUNTRY field + */ + const SHOP_COUNTRY = 'country.SHOP_COUNTRY'; + /** * the column name for the CREATED_AT field */ @@ -130,12 +135,12 @@ class CountryTableMap extends TableMap * e.g. self::$fieldNames[self::TYPE_PHPNAME][0] = 'Id' */ protected static $fieldNames = array ( - self::TYPE_PHPNAME => array('Id', 'AreaId', 'Isocode', 'Isoalpha2', 'Isoalpha3', 'ByDefault', 'CreatedAt', 'UpdatedAt', ), - self::TYPE_STUDLYPHPNAME => array('id', 'areaId', 'isocode', 'isoalpha2', 'isoalpha3', 'byDefault', 'createdAt', 'updatedAt', ), - self::TYPE_COLNAME => array(CountryTableMap::ID, CountryTableMap::AREA_ID, CountryTableMap::ISOCODE, CountryTableMap::ISOALPHA2, CountryTableMap::ISOALPHA3, CountryTableMap::BY_DEFAULT, CountryTableMap::CREATED_AT, CountryTableMap::UPDATED_AT, ), - self::TYPE_RAW_COLNAME => array('ID', 'AREA_ID', 'ISOCODE', 'ISOALPHA2', 'ISOALPHA3', 'BY_DEFAULT', 'CREATED_AT', 'UPDATED_AT', ), - self::TYPE_FIELDNAME => array('id', 'area_id', 'isocode', 'isoalpha2', 'isoalpha3', 'by_default', 'created_at', 'updated_at', ), - self::TYPE_NUM => array(0, 1, 2, 3, 4, 5, 6, 7, ) + self::TYPE_PHPNAME => array('Id', 'AreaId', 'Isocode', 'Isoalpha2', 'Isoalpha3', 'ByDefault', 'ShopCountry', 'CreatedAt', 'UpdatedAt', ), + self::TYPE_STUDLYPHPNAME => array('id', 'areaId', 'isocode', 'isoalpha2', 'isoalpha3', 'byDefault', 'shopCountry', 'createdAt', 'updatedAt', ), + self::TYPE_COLNAME => array(CountryTableMap::ID, CountryTableMap::AREA_ID, CountryTableMap::ISOCODE, CountryTableMap::ISOALPHA2, CountryTableMap::ISOALPHA3, CountryTableMap::BY_DEFAULT, CountryTableMap::SHOP_COUNTRY, CountryTableMap::CREATED_AT, CountryTableMap::UPDATED_AT, ), + self::TYPE_RAW_COLNAME => array('ID', 'AREA_ID', 'ISOCODE', 'ISOALPHA2', 'ISOALPHA3', 'BY_DEFAULT', 'SHOP_COUNTRY', 'CREATED_AT', 'UPDATED_AT', ), + self::TYPE_FIELDNAME => array('id', 'area_id', 'isocode', 'isoalpha2', 'isoalpha3', 'by_default', 'shop_country', 'created_at', 'updated_at', ), + self::TYPE_NUM => array(0, 1, 2, 3, 4, 5, 6, 7, 8, ) ); /** @@ -145,12 +150,12 @@ class CountryTableMap extends TableMap * e.g. self::$fieldKeys[self::TYPE_PHPNAME]['Id'] = 0 */ protected static $fieldKeys = array ( - self::TYPE_PHPNAME => array('Id' => 0, 'AreaId' => 1, 'Isocode' => 2, 'Isoalpha2' => 3, 'Isoalpha3' => 4, 'ByDefault' => 5, 'CreatedAt' => 6, 'UpdatedAt' => 7, ), - self::TYPE_STUDLYPHPNAME => array('id' => 0, 'areaId' => 1, 'isocode' => 2, 'isoalpha2' => 3, 'isoalpha3' => 4, 'byDefault' => 5, 'createdAt' => 6, 'updatedAt' => 7, ), - self::TYPE_COLNAME => array(CountryTableMap::ID => 0, CountryTableMap::AREA_ID => 1, CountryTableMap::ISOCODE => 2, CountryTableMap::ISOALPHA2 => 3, CountryTableMap::ISOALPHA3 => 4, CountryTableMap::BY_DEFAULT => 5, CountryTableMap::CREATED_AT => 6, CountryTableMap::UPDATED_AT => 7, ), - self::TYPE_RAW_COLNAME => array('ID' => 0, 'AREA_ID' => 1, 'ISOCODE' => 2, 'ISOALPHA2' => 3, 'ISOALPHA3' => 4, 'BY_DEFAULT' => 5, 'CREATED_AT' => 6, 'UPDATED_AT' => 7, ), - self::TYPE_FIELDNAME => array('id' => 0, 'area_id' => 1, 'isocode' => 2, 'isoalpha2' => 3, 'isoalpha3' => 4, 'by_default' => 5, 'created_at' => 6, 'updated_at' => 7, ), - self::TYPE_NUM => array(0, 1, 2, 3, 4, 5, 6, 7, ) + self::TYPE_PHPNAME => array('Id' => 0, 'AreaId' => 1, 'Isocode' => 2, 'Isoalpha2' => 3, 'Isoalpha3' => 4, 'ByDefault' => 5, 'ShopCountry' => 6, 'CreatedAt' => 7, 'UpdatedAt' => 8, ), + self::TYPE_STUDLYPHPNAME => array('id' => 0, 'areaId' => 1, 'isocode' => 2, 'isoalpha2' => 3, 'isoalpha3' => 4, 'byDefault' => 5, 'shopCountry' => 6, 'createdAt' => 7, 'updatedAt' => 8, ), + self::TYPE_COLNAME => array(CountryTableMap::ID => 0, CountryTableMap::AREA_ID => 1, CountryTableMap::ISOCODE => 2, CountryTableMap::ISOALPHA2 => 3, CountryTableMap::ISOALPHA3 => 4, CountryTableMap::BY_DEFAULT => 5, CountryTableMap::SHOP_COUNTRY => 6, CountryTableMap::CREATED_AT => 7, CountryTableMap::UPDATED_AT => 8, ), + self::TYPE_RAW_COLNAME => array('ID' => 0, 'AREA_ID' => 1, 'ISOCODE' => 2, 'ISOALPHA2' => 3, 'ISOALPHA3' => 4, 'BY_DEFAULT' => 5, 'SHOP_COUNTRY' => 6, 'CREATED_AT' => 7, 'UPDATED_AT' => 8, ), + self::TYPE_FIELDNAME => array('id' => 0, 'area_id' => 1, 'isocode' => 2, 'isoalpha2' => 3, 'isoalpha3' => 4, 'by_default' => 5, 'shop_country' => 6, 'created_at' => 7, 'updated_at' => 8, ), + self::TYPE_NUM => array(0, 1, 2, 3, 4, 5, 6, 7, 8, ) ); /** @@ -174,7 +179,8 @@ class CountryTableMap extends TableMap $this->addColumn('ISOCODE', 'Isocode', 'VARCHAR', true, 4, null); $this->addColumn('ISOALPHA2', 'Isoalpha2', 'VARCHAR', false, 2, null); $this->addColumn('ISOALPHA3', 'Isoalpha3', 'VARCHAR', false, 4, null); - $this->addColumn('BY_DEFAULT', 'ByDefault', 'TINYINT', false, null, null); + $this->addColumn('BY_DEFAULT', 'ByDefault', 'TINYINT', false, null, 0); + $this->addColumn('SHOP_COUNTRY', 'ShopCountry', 'BOOLEAN', true, 1, false); $this->addColumn('CREATED_AT', 'CreatedAt', 'TIMESTAMP', false, null, null); $this->addColumn('UPDATED_AT', 'UpdatedAt', 'TIMESTAMP', false, null, null); } // initialize() @@ -358,6 +364,7 @@ class CountryTableMap extends TableMap $criteria->addSelectColumn(CountryTableMap::ISOALPHA2); $criteria->addSelectColumn(CountryTableMap::ISOALPHA3); $criteria->addSelectColumn(CountryTableMap::BY_DEFAULT); + $criteria->addSelectColumn(CountryTableMap::SHOP_COUNTRY); $criteria->addSelectColumn(CountryTableMap::CREATED_AT); $criteria->addSelectColumn(CountryTableMap::UPDATED_AT); } else { @@ -367,6 +374,7 @@ class CountryTableMap extends TableMap $criteria->addSelectColumn($alias . '.ISOALPHA2'); $criteria->addSelectColumn($alias . '.ISOALPHA3'); $criteria->addSelectColumn($alias . '.BY_DEFAULT'); + $criteria->addSelectColumn($alias . '.SHOP_COUNTRY'); $criteria->addSelectColumn($alias . '.CREATED_AT'); $criteria->addSelectColumn($alias . '.UPDATED_AT'); } diff --git a/core/lib/Thelia/Model/Map/ProductPriceTableMap.php b/core/lib/Thelia/Model/Map/ProductPriceTableMap.php index 86a22b680..7a80d2e12 100644 --- a/core/lib/Thelia/Model/Map/ProductPriceTableMap.php +++ b/core/lib/Thelia/Model/Map/ProductPriceTableMap.php @@ -57,7 +57,7 @@ class ProductPriceTableMap extends TableMap /** * The total number of columns */ - const NUM_COLUMNS = 6; + const NUM_COLUMNS = 7; /** * The number of lazy-loaded columns @@ -67,7 +67,7 @@ class ProductPriceTableMap extends TableMap /** * The number of columns to hydrate (NUM_COLUMNS - NUM_LAZY_LOAD_COLUMNS) */ - const NUM_HYDRATE_COLUMNS = 6; + const NUM_HYDRATE_COLUMNS = 7; /** * the column name for the PRODUCT_SALE_ELEMENTS_ID field @@ -89,6 +89,11 @@ class ProductPriceTableMap extends TableMap */ const PROMO_PRICE = 'product_price.PROMO_PRICE'; + /** + * the column name for the FROM_DEFAULT_CURRENCY field + */ + const FROM_DEFAULT_CURRENCY = 'product_price.FROM_DEFAULT_CURRENCY'; + /** * the column name for the CREATED_AT field */ @@ -111,12 +116,12 @@ class ProductPriceTableMap extends TableMap * e.g. self::$fieldNames[self::TYPE_PHPNAME][0] = 'Id' */ protected static $fieldNames = array ( - self::TYPE_PHPNAME => array('ProductSaleElementsId', 'CurrencyId', 'Price', 'PromoPrice', 'CreatedAt', 'UpdatedAt', ), - self::TYPE_STUDLYPHPNAME => array('productSaleElementsId', 'currencyId', 'price', 'promoPrice', 'createdAt', 'updatedAt', ), - self::TYPE_COLNAME => array(ProductPriceTableMap::PRODUCT_SALE_ELEMENTS_ID, ProductPriceTableMap::CURRENCY_ID, ProductPriceTableMap::PRICE, ProductPriceTableMap::PROMO_PRICE, ProductPriceTableMap::CREATED_AT, ProductPriceTableMap::UPDATED_AT, ), - self::TYPE_RAW_COLNAME => array('PRODUCT_SALE_ELEMENTS_ID', 'CURRENCY_ID', 'PRICE', 'PROMO_PRICE', 'CREATED_AT', 'UPDATED_AT', ), - self::TYPE_FIELDNAME => array('product_sale_elements_id', 'currency_id', 'price', 'promo_price', 'created_at', 'updated_at', ), - self::TYPE_NUM => array(0, 1, 2, 3, 4, 5, ) + self::TYPE_PHPNAME => array('ProductSaleElementsId', 'CurrencyId', 'Price', 'PromoPrice', 'FromDefaultCurrency', 'CreatedAt', 'UpdatedAt', ), + self::TYPE_STUDLYPHPNAME => array('productSaleElementsId', 'currencyId', 'price', 'promoPrice', 'fromDefaultCurrency', 'createdAt', 'updatedAt', ), + self::TYPE_COLNAME => array(ProductPriceTableMap::PRODUCT_SALE_ELEMENTS_ID, ProductPriceTableMap::CURRENCY_ID, ProductPriceTableMap::PRICE, ProductPriceTableMap::PROMO_PRICE, ProductPriceTableMap::FROM_DEFAULT_CURRENCY, ProductPriceTableMap::CREATED_AT, ProductPriceTableMap::UPDATED_AT, ), + self::TYPE_RAW_COLNAME => array('PRODUCT_SALE_ELEMENTS_ID', 'CURRENCY_ID', 'PRICE', 'PROMO_PRICE', 'FROM_DEFAULT_CURRENCY', 'CREATED_AT', 'UPDATED_AT', ), + self::TYPE_FIELDNAME => array('product_sale_elements_id', 'currency_id', 'price', 'promo_price', 'from_default_currency', 'created_at', 'updated_at', ), + self::TYPE_NUM => array(0, 1, 2, 3, 4, 5, 6, ) ); /** @@ -126,12 +131,12 @@ class ProductPriceTableMap extends TableMap * e.g. self::$fieldKeys[self::TYPE_PHPNAME]['Id'] = 0 */ protected static $fieldKeys = array ( - self::TYPE_PHPNAME => array('ProductSaleElementsId' => 0, 'CurrencyId' => 1, 'Price' => 2, 'PromoPrice' => 3, 'CreatedAt' => 4, 'UpdatedAt' => 5, ), - self::TYPE_STUDLYPHPNAME => array('productSaleElementsId' => 0, 'currencyId' => 1, 'price' => 2, 'promoPrice' => 3, 'createdAt' => 4, 'updatedAt' => 5, ), - self::TYPE_COLNAME => array(ProductPriceTableMap::PRODUCT_SALE_ELEMENTS_ID => 0, ProductPriceTableMap::CURRENCY_ID => 1, ProductPriceTableMap::PRICE => 2, ProductPriceTableMap::PROMO_PRICE => 3, ProductPriceTableMap::CREATED_AT => 4, ProductPriceTableMap::UPDATED_AT => 5, ), - self::TYPE_RAW_COLNAME => array('PRODUCT_SALE_ELEMENTS_ID' => 0, 'CURRENCY_ID' => 1, 'PRICE' => 2, 'PROMO_PRICE' => 3, 'CREATED_AT' => 4, 'UPDATED_AT' => 5, ), - self::TYPE_FIELDNAME => array('product_sale_elements_id' => 0, 'currency_id' => 1, 'price' => 2, 'promo_price' => 3, 'created_at' => 4, 'updated_at' => 5, ), - self::TYPE_NUM => array(0, 1, 2, 3, 4, 5, ) + self::TYPE_PHPNAME => array('ProductSaleElementsId' => 0, 'CurrencyId' => 1, 'Price' => 2, 'PromoPrice' => 3, 'FromDefaultCurrency' => 4, 'CreatedAt' => 5, 'UpdatedAt' => 6, ), + self::TYPE_STUDLYPHPNAME => array('productSaleElementsId' => 0, 'currencyId' => 1, 'price' => 2, 'promoPrice' => 3, 'fromDefaultCurrency' => 4, 'createdAt' => 5, 'updatedAt' => 6, ), + self::TYPE_COLNAME => array(ProductPriceTableMap::PRODUCT_SALE_ELEMENTS_ID => 0, ProductPriceTableMap::CURRENCY_ID => 1, ProductPriceTableMap::PRICE => 2, ProductPriceTableMap::PROMO_PRICE => 3, ProductPriceTableMap::FROM_DEFAULT_CURRENCY => 4, ProductPriceTableMap::CREATED_AT => 5, ProductPriceTableMap::UPDATED_AT => 6, ), + self::TYPE_RAW_COLNAME => array('PRODUCT_SALE_ELEMENTS_ID' => 0, 'CURRENCY_ID' => 1, 'PRICE' => 2, 'PROMO_PRICE' => 3, 'FROM_DEFAULT_CURRENCY' => 4, 'CREATED_AT' => 5, 'UPDATED_AT' => 6, ), + self::TYPE_FIELDNAME => array('product_sale_elements_id' => 0, 'currency_id' => 1, 'price' => 2, 'promo_price' => 3, 'from_default_currency' => 4, 'created_at' => 5, 'updated_at' => 6, ), + self::TYPE_NUM => array(0, 1, 2, 3, 4, 5, 6, ) ); /** @@ -154,6 +159,7 @@ class ProductPriceTableMap extends TableMap $this->addForeignPrimaryKey('CURRENCY_ID', 'CurrencyId', 'INTEGER' , 'currency', 'ID', true, null, null); $this->addColumn('PRICE', 'Price', 'FLOAT', true, null, null); $this->addColumn('PROMO_PRICE', 'PromoPrice', 'FLOAT', false, null, null); + $this->addColumn('FROM_DEFAULT_CURRENCY', 'FromDefaultCurrency', 'BOOLEAN', true, 1, false); $this->addColumn('CREATED_AT', 'CreatedAt', 'TIMESTAMP', false, null, null); $this->addColumn('UPDATED_AT', 'UpdatedAt', 'TIMESTAMP', false, null, null); } // initialize() @@ -371,6 +377,7 @@ class ProductPriceTableMap extends TableMap $criteria->addSelectColumn(ProductPriceTableMap::CURRENCY_ID); $criteria->addSelectColumn(ProductPriceTableMap::PRICE); $criteria->addSelectColumn(ProductPriceTableMap::PROMO_PRICE); + $criteria->addSelectColumn(ProductPriceTableMap::FROM_DEFAULT_CURRENCY); $criteria->addSelectColumn(ProductPriceTableMap::CREATED_AT); $criteria->addSelectColumn(ProductPriceTableMap::UPDATED_AT); } else { @@ -378,6 +385,7 @@ class ProductPriceTableMap extends TableMap $criteria->addSelectColumn($alias . '.CURRENCY_ID'); $criteria->addSelectColumn($alias . '.PRICE'); $criteria->addSelectColumn($alias . '.PROMO_PRICE'); + $criteria->addSelectColumn($alias . '.FROM_DEFAULT_CURRENCY'); $criteria->addSelectColumn($alias . '.CREATED_AT'); $criteria->addSelectColumn($alias . '.UPDATED_AT'); } diff --git a/core/lib/Thelia/Model/Map/ProfileModuleTableMap.php b/core/lib/Thelia/Model/Map/ProfileModuleTableMap.php index 2ed417f75..a0b17ba64 100644 --- a/core/lib/Thelia/Model/Map/ProfileModuleTableMap.php +++ b/core/lib/Thelia/Model/Map/ProfileModuleTableMap.php @@ -147,7 +147,7 @@ class ProfileModuleTableMap extends TableMap // columns $this->addForeignPrimaryKey('PROFILE_ID', 'ProfileId', 'INTEGER' , 'profile', 'ID', true, null, null); $this->addForeignPrimaryKey('MODULE_ID', 'ModuleId', 'INTEGER' , 'module', 'ID', true, null, null); - $this->addColumn('ACCESS', 'Access', 'INTEGER', true, null, 0); + $this->addColumn('ACCESS', 'Access', 'TINYINT', false, null, 0); $this->addColumn('CREATED_AT', 'CreatedAt', 'TIMESTAMP', false, null, null); $this->addColumn('UPDATED_AT', 'UpdatedAt', 'TIMESTAMP', false, null, null); } // initialize() diff --git a/core/lib/Thelia/Model/Product.php b/core/lib/Thelia/Model/Product.php index f48f9e75e..5ec2abf4c 100755 --- a/core/lib/Thelia/Model/Product.php +++ b/core/lib/Thelia/Model/Product.php @@ -12,6 +12,7 @@ use Thelia\Core\Event\Product\ProductEvent; use Propel\Runtime\ActiveQuery\Criteria; use Propel\Runtime\Propel; use Thelia\Model\Map\ProductTableMap; +use Thelia\Model\ProductSaleElementsQuery; class Product extends BaseProduct { @@ -47,6 +48,20 @@ class Product extends BaseProduct return $taxCalculator->load($this, $country)->getTaxedPrice($this->getRealLowestPrice()); } + /** + * Return the default PSE for this product. + */ + public function getDefaultSaleElements() { + return ProductSaleElementsQuery::create()->filterByProductId($this->id)->filterByIsDefault(true)->find(); + } + + /** + * Return PSE count fir this product. + */ + public function countSaleElements() { + return ProductSaleElementsQuery::create()->filterByProductId($this->id)->filterByIsDefault(true)->count(); + } + /** * @return the current default category ID for this product */ @@ -100,7 +115,7 @@ class Product extends BaseProduct ; if ($productCategory == null || $productCategory->getCategoryId() != $defaultCategoryId) { - exit; + // Delete the old default category if ($productCategory !== null) $productCategory->delete(); @@ -131,10 +146,10 @@ class Product extends BaseProduct $con = Propel::getWriteConnection(ProductTableMap::DATABASE_NAME); $con->beginTransaction(); - $this->dispatchEvent(TheliaEvents::BEFORE_CREATEPRODUCT, new ProductEvent($this)); try { + // Create the product $this->save($con); @@ -146,29 +161,8 @@ class Product extends BaseProduct $this->setTaxRuleId($taxRuleId); - // Create an empty product sale element - $sale_elements = new ProductSaleElements(); - - $sale_elements - ->setProduct($this) - ->setRef($this->getRef()) - ->setPromo(0) - ->setNewness(0) - ->setWeight($baseWeight) - ->setIsDefault(true) - ->save($con) - ; - - // Create an empty product price in the default currency - $product_price = new ProductPrice(); - - $product_price - ->setProductSaleElements($sale_elements) - ->setPromoPrice($basePrice) - ->setPrice($basePrice) - ->setCurrencyId($priceCurrencyId) - ->save($con) - ; + // Create the default product sale element of this product + $sale_elements = $this->createDefaultProductSaleElement($con, $baseWeight, $basePrice, $priceCurrencyId, true); // Store all the stuff ! $con->commit(); @@ -183,6 +177,38 @@ class Product extends BaseProduct } } + /** + * Create a basic product sale element attached to this product. + */ + public function createDefaultProductSaleElement(ConnectionInterface $con, $weight, $basePrice, $currencyId, $isDefault) { + + // Create an empty product sale element + $sale_elements = new ProductSaleElements(); + + $sale_elements + ->setProduct($this) + ->setRef($this->getRef()) + ->setPromo(0) + ->setNewness(0) + ->setWeight($weight) + ->setIsDefault($isDefault) + ->save($con) + ; + + // Create an empty product price in the default currency + $product_price = new ProductPrice(); + + $product_price + ->setProductSaleElements($sale_elements) + ->setPromoPrice($basePrice) + ->setPrice($basePrice) + ->setCurrencyId($currencyId) + ->save($con) + ; + + return $sale_elements; + } + /** * Calculate next position relative to our default category */ diff --git a/core/lib/Thelia/Model/Profile.php b/core/lib/Thelia/Model/Profile.php index 8f3a61edd..b140146f3 100644 --- a/core/lib/Thelia/Model/Profile.php +++ b/core/lib/Thelia/Model/Profile.php @@ -1,5 +1,4 @@ . */ +/* */ +/*************************************************************************************/ + +namespace Thelia\Tools; + +use Symfony\Component\HttpFoundation\Request; + +class NumberFormat +{ + protected $request; + + public function __construct(Request $request) + { + $this->request = $request; + } + + public static function getInstance(Request $request) + { + return new NumberFormat($request); + } + + public function format($number, $decimals = null, $decPoint = null, $thousandsSep = null) + { + $lang = $this->request->getSession()->getLang(); + + if ($decimals == null) $decimals = $lang->getDecimals(); + if ($decPoint == null) $decPoint = $lang->getDecimalSeparator(); + if ($thousandsSep == null) $thousandsSep = $lang->getThousandsSeparator(); + + return number_format($number, $decimals, $decPoint, $thousandsSep); + } +} \ No newline at end of file diff --git a/install/insert.sql b/install/insert.sql index 89454096b..bf9022df4 100755 --- a/install/insert.sql +++ b/install/insert.sql @@ -91,270 +91,271 @@ INSERT INTO `area` (`id`, `name`, `postage`, `created_at`, `updated_at`) VALUES INSERT INTO `area_delivery_module` (`id`, `area_id`, `delivery_module_id`, `created_at`, `updated_at`) VALUES (1, 1, 2, NOW(), NOW()); -INSERT INTO `country` (`id`, `area_id`, `isocode`, `isoalpha2`, `isoalpha3`, `by_default`, `created_at`, `updated_at`) VALUES -(1, NULL, '4', 'AF', 'AFG', 0, NOW(), NOW()), -(2, NULL, '710', 'ZA', 'ZAF', 0, NOW(), NOW()), -(3, NULL, '8', 'AL', 'ALB', 0, NOW(), NOW()), -(4, NULL, '12', 'DZ', 'DZA', 0, NOW(), NOW()), -(5, NULL, '276', 'DE', 'DEU', 0, NOW(), NOW()), -(6, NULL, '20', 'AD', 'AND', 0, NOW(), NOW()), -(7, NULL, '24', 'AO', 'AGO', 0, NOW(), NOW()), -(8, NULL, '28', 'AG', 'ATG', 0, NOW(), NOW()), -(9, NULL, '682', 'SA', 'SAU', 0, NOW(), NOW()), -(10, NULL, '32', 'AR', 'ARG', 0, NOW(), NOW()), -(11, NULL, '51', 'AM', 'ARM', 0, NOW(), NOW()), -(12, NULL, '36', 'AU', 'AUS', 0, NOW(), NOW()), -(13, NULL, '40', 'AT', 'AUT', 0, NOW(), NOW()), -(14, NULL, '31', 'AZ', 'AZE', 0, NOW(), NOW()), -(15, NULL, '44', 'BS', 'BHS', 0, NOW(), NOW()), -(16, NULL, '48', 'BR', 'BHR', 0, NOW(), NOW()), -(17, NULL, '50', 'BD', 'BGD', 0, NOW(), NOW()), -(18, NULL, '52', 'BB', 'BRB', 0, NOW(), NOW()), -(19, NULL, '585', 'PW', 'PLW', 0, NOW(), NOW()), -(20, NULL, '56', 'BE', 'BEL', 0, NOW(), NOW()), -(21, NULL, '84', 'BL', 'BLZ', 0, NOW(), NOW()), -(22, NULL, '204', 'BJ', 'BEN', 0, NOW(), NOW()), -(23, NULL, '64', 'BT', 'BTN', 0, NOW(), NOW()), -(24, NULL, '112', 'BY', 'BLR', 0, NOW(), NOW()), -(25, NULL, '104', 'MM', 'MMR', 0, NOW(), NOW()), -(26, NULL, '68', 'BO', 'BOL', 0, NOW(), NOW()), -(27, NULL, '70', 'BA', 'BIH', 0, NOW(), NOW()), -(28, NULL, '72', 'BW', 'BWA', 0, NOW(), NOW()), -(29, NULL, '76', 'BR', 'BRA', 0, NOW(), NOW()), -(30, NULL, '96', 'BN', 'BRN', 0, NOW(), NOW()), -(31, NULL, '100', 'BG', 'BGR', 0, NOW(), NOW()), -(32, NULL, '854', 'BF', 'BFA', 0, NOW(), NOW()), -(33, NULL, '108', 'BI', 'BDI', 0, NOW(), NOW()), -(34, NULL, '116', 'KH', 'KHM', 0, NOW(), NOW()), -(35, NULL, '120', 'CM', 'CMR', 0, NOW(), NOW()), -(37, NULL, '132', 'CV', 'CPV', 0, NOW(), NOW()), -(38, NULL, '152', 'CL', 'CHL', 0, NOW(), NOW()), -(39, NULL, '156', 'CN', 'CHN', 0, NOW(), NOW()), -(40, NULL, '196', 'CY', 'CYP', 0, NOW(), NOW()), -(41, NULL, '170', 'CO', 'COL', 0, NOW(), NOW()), -(42, NULL, '174', 'KM', 'COM', 0, NOW(), NOW()), -(43, NULL, '178', 'CG', 'COG', 0, NOW(), NOW()), -(44, NULL, '184', 'CK', 'COK', 0, NOW(), NOW()), -(45, NULL, '408', 'KP', 'PRK', 0, NOW(), NOW()), -(46, NULL, '410', 'KR', 'KOR', 0, NOW(), NOW()), -(47, NULL, '188', 'CR', 'CRI', 0, NOW(), NOW()), -(48, NULL, '384', 'CI', 'CIV', 0, NOW(), NOW()), -(49, NULL, '191', 'HR', 'HRV', 0, NOW(), NOW()), -(50, NULL, '192', 'CU', 'CUB', 0, NOW(), NOW()), -(51, NULL, '208', 'DK', 'DNK', 0, NOW(), NOW()), -(52, NULL, '262', 'DJ', 'DJI', 0, NOW(), NOW()), -(53, NULL, '212', 'DM', 'DMA', 0, NOW(), NOW()), -(54, NULL, '818', 'EG', 'EGY', 0, NOW(), NOW()), -(55, NULL, '784', 'AE', 'ARE', 0, NOW(), NOW()), -(56, NULL, '218', 'EC', 'ECU', 0, NOW(), NOW()), -(57, NULL, '232', 'ER', 'ERI', 0, NOW(), NOW()), -(58, NULL, '724', 'ES', 'ESP', 0, NOW(), NOW()), -(59, NULL, '233', 'EE', 'EST', 0, NOW(), NOW()), -(61, NULL, '231', 'ET', 'ETH', 0, NOW(), NOW()), -(62, NULL, '242', 'FJ', 'FJI', 0, NOW(), NOW()), -(63, NULL, '246', 'FI', 'FIN', 0, NOW(), NOW()), -(64, 1, '250', 'FR', 'FRA', 1, NOW(), NOW()), -(65, NULL, '266', 'GA', 'GAB', 0, NOW(), NOW()), -(66, NULL, '270', 'GM', 'GMB', 0, NOW(), NOW()), -(67, NULL, '268', 'GE', 'GEO', 0, NOW(), NOW()), -(68, NULL, '288', 'GH', 'GHA', 0, NOW(), NOW()), -(69, NULL, '300', 'GR', 'GRC', 0, NOW(), NOW()), -(70, NULL, '308', 'GD', 'GRD', 0, NOW(), NOW()), -(71, NULL, '320', 'GT', 'GTM', 0, NOW(), NOW()), -(72, NULL, '324', 'GN', 'GIN', 0, NOW(), NOW()), -(73, NULL, '624', 'GW', 'GNB', 0, NOW(), NOW()), -(74, NULL, '226', 'GQ', 'GNQ', 0, NOW(), NOW()), -(75, NULL, '328', 'GY', 'GUY', 0, NOW(), NOW()), -(76, NULL, '332', 'HT', 'HTI', 0, NOW(), NOW()), -(77, NULL, '340', 'HN', 'HND', 0, NOW(), NOW()), -(78, NULL, '348', 'HU', 'HUN', 0, NOW(), NOW()), -(79, NULL, '356', 'IN', 'IND', 0, NOW(), NOW()), -(80, NULL, '360', 'ID', 'IDN', 0, NOW(), NOW()), -(81, NULL, '364', 'IR', 'IRN', 0, NOW(), NOW()), -(82, NULL, '368', 'IQ', 'IRQ', 0, NOW(), NOW()), -(83, NULL, '372', 'IE', 'IRL', 0, NOW(), NOW()), -(84, NULL, '352', 'IS', 'ISL', 0, NOW(), NOW()), -(85, NULL, '376', 'IL', 'ISR', 0, NOW(), NOW()), -(86, NULL, '380', 'IT', 'ITA', 0, NOW(), NOW()), -(87, NULL, '388', 'JM', 'JAM', 0, NOW(), NOW()), -(88, NULL, '392', 'JP', 'JPN', 0, NOW(), NOW()), -(89, NULL, '400', 'JO', 'JOR', 0, NOW(), NOW()), -(90, NULL, '398', 'KZ', 'KAZ', 0, NOW(), NOW()), -(91, NULL, '404', 'KE', 'KEN', 0, NOW(), NOW()), -(92, NULL, '417', 'KG', 'KGZ', 0, NOW(), NOW()), -(93, NULL, '296', 'KI', 'KIR', 0, NOW(), NOW()), -(94, NULL, '414', 'KW', 'KWT', 0, NOW(), NOW()), -(95, NULL, '418', 'LA', 'LAO', 0, NOW(), NOW()), -(96, NULL, '426', 'LS', 'LSO', 0, NOW(), NOW()), -(97, NULL, '428', 'LV', 'LVA', 0, NOW(), NOW()), -(98, NULL, '422', 'LB', 'LBN', 0, NOW(), NOW()), -(99, NULL, '430', 'LR', 'LBR', 0, NOW(), NOW()), -(100, NULL, '343', 'LY', 'LBY', 0, NOW(), NOW()), -(101, NULL, '438', 'LI', 'LIE', 0, NOW(), NOW()), -(102, NULL, '440', 'LT', 'LTU', 0, NOW(), NOW()), -(103, NULL, '442', 'LU', 'LUX', 0, NOW(), NOW()), -(104, NULL, '807', 'MK', 'MKD', 0, NOW(), NOW()), -(105, NULL, '450', 'MD', 'MDG', 0, NOW(), NOW()), -(106, NULL, '458', 'MY', 'MYS', 0, NOW(), NOW()), -(107, NULL, '454', 'MW', 'MWI', 0, NOW(), NOW()), -(108, NULL, '462', 'MV', 'MDV', 0, NOW(), NOW()), -(109, NULL, '466', 'ML', 'MLI', 0, NOW(), NOW()), -(110, NULL, '470', 'MT', 'MLT', 0, NOW(), NOW()), -(111, NULL, '504', 'MA', 'MAR', 0, NOW(), NOW()), -(112, NULL, '584', 'MH', 'MHL', 0, NOW(), NOW()), -(113, NULL, '480', 'MU', 'MUS', 0, NOW(), NOW()), -(114, NULL, '478', 'MR', 'MRT', 0, NOW(), NOW()), -(115, NULL, '484', 'MX', 'MEX', 0, NOW(), NOW()), -(116, NULL, '583', 'FM', 'FSM', 0, NOW(), NOW()), -(117, NULL, '498', 'MD', 'MDA', 0, NOW(), NOW()), -(118, NULL, '492', 'MC', 'MCO', 0, NOW(), NOW()), -(119, NULL, '496', 'MN', 'MNG', 0, NOW(), NOW()), -(120, NULL, '508', 'MZ', 'MOZ', 0, NOW(), NOW()), -(121, NULL, '516', 'NA', 'NAM', 0, NOW(), NOW()), -(122, NULL, '520', 'NR', 'NRU', 0, NOW(), NOW()), -(123, NULL, '524', 'NP', 'NPL', 0, NOW(), NOW()), -(124, NULL, '558', 'NI', 'NIC', 0, NOW(), NOW()), -(125, NULL, '562', 'NE', 'NER', 0, NOW(), NOW()), -(126, NULL, '566', 'NG', 'NGA', 0, NOW(), NOW()), -(127, NULL, '570', 'NU', 'NIU', 0, NOW(), NOW()), -(128, NULL, '578', 'NO', 'NOR', 0, NOW(), NOW()), -(129, NULL, '554', 'NZ', 'NZL', 0, NOW(), NOW()), -(130, NULL, '512', 'OM', 'OMN', 0, NOW(), NOW()), -(131, NULL, '800', 'UG', 'UGA', 0, NOW(), NOW()), -(132, NULL, '860', 'UZ', 'UZB', 0, NOW(), NOW()), -(133, NULL, '586', 'PK', 'PAK', 0, NOW(), NOW()), -(134, NULL, '591', 'PA', 'PAN', 0, NOW(), NOW()), -(135, NULL, '598', 'PG', 'PNG', 0, NOW(), NOW()), -(136, NULL, '600', 'PY', 'PRY', 0, NOW(), NOW()), -(137, NULL, '528', 'NL', 'NLD', 0, NOW(), NOW()), -(138, NULL, '604', 'PE', 'PER', 0, NOW(), NOW()), -(139, NULL, '608', 'PH', 'PHL', 0, NOW(), NOW()), -(140, NULL, '616', 'PL', 'POL', 0, NOW(), NOW()), -(141, NULL, '620', 'PT', 'PRT', 0, NOW(), NOW()), -(142, NULL, '634', 'QA', 'QAT', 0, NOW(), NOW()), -(143, NULL, '140', 'CF', 'CAF', 0, NOW(), NOW()), -(144, NULL, '214', 'DO', 'DOM', 0, NOW(), NOW()), -(145, NULL, '203', 'CZ', 'CZE', 0, NOW(), NOW()), -(146, NULL, '642', 'RO', 'ROU', 0, NOW(), NOW()), -(147, NULL, '826', 'GB', 'GBR', 0, NOW(), NOW()), -(148, NULL, '643', 'RU', 'RUS', 0, NOW(), NOW()), -(149, NULL, '646', 'RW', 'RWA', 0, NOW(), NOW()), -(150, NULL, '659', 'KN', 'KNA', 0, NOW(), NOW()), -(151, NULL, '662', 'LC', 'LCA', 0, NOW(), NOW()), -(152, NULL, '674', 'SM', 'SMR', 0, NOW(), NOW()), -(153, NULL, '670', 'VC', 'VCT', 0, NOW(), NOW()), -(154, NULL, '90', 'SB', 'SLB', 0, NOW(), NOW()), -(155, NULL, '222', 'SV', 'SLV', 0, NOW(), NOW()), -(156, NULL, '882', 'WS', 'WSM', 0, NOW(), NOW()), -(157, NULL, '678', 'ST', 'STP', 0, NOW(), NOW()), -(158, NULL, '686', 'SN', 'SEN', 0, NOW(), NOW()), -(159, NULL, '690', 'SC', 'SYC', 0, NOW(), NOW()), -(160, NULL, '694', 'SL', 'SLE', 0, NOW(), NOW()), -(161, NULL, '702', 'SG', 'SGP', 0, NOW(), NOW()), -(162, NULL, '703', 'SK', 'SVK', 0, NOW(), NOW()), -(163, NULL, '705', 'SI', 'SVN', 0, NOW(), NOW()), -(164, NULL, '706', 'SO', 'SOM', 0, NOW(), NOW()), -(165, NULL, '729', 'SD', 'SDN', 0, NOW(), NOW()), -(166, NULL, '144', 'LK', 'LKA', 0, NOW(), NOW()), -(167, NULL, '752', 'SE', 'SWE', 0, NOW(), NOW()), -(168, NULL, '756', 'CH', 'CHE', 0, NOW(), NOW()), -(169, NULL, '740', 'SR', 'SUR', 0, NOW(), NOW()), -(170, NULL, '748', 'SZ', 'SWZ', 0, NOW(), NOW()), -(171, NULL, '760', 'SY', 'SYR', 0, NOW(), NOW()), -(172, NULL, '762', 'TJ', 'TJK', 0, NOW(), NOW()), -(173, NULL, '834', 'TZ', 'TZA', 0, NOW(), NOW()), -(174, NULL, '148', 'TD', 'TCD', 0, NOW(), NOW()), -(175, NULL, '764', 'TH', 'THA', 0, NOW(), NOW()), -(176, NULL, '768', 'TG', 'TGO', 0, NOW(), NOW()), -(177, NULL, '776', 'TO', 'TON', 0, NOW(), NOW()), -(178, NULL, '780', 'TT', 'TTO', 0, NOW(), NOW()), -(179, NULL, '788', 'TN', 'TUN', 0, NOW(), NOW()), -(180, NULL, '795', 'TM', 'TKM', 0, NOW(), NOW()), -(181, NULL, '792', 'TR', 'TUR', 0, NOW(), NOW()), -(182, NULL, '798', 'TV', 'TUV', 0, NOW(), NOW()), -(183, NULL, '804', 'UA', 'UKR', 0, NOW(), NOW()), -(184, NULL, '858', 'UY', 'URY', 0, NOW(), NOW()), -(185, NULL, '336', 'VA', 'VAT', 0, NOW(), NOW()), -(186, NULL, '548', 'VU', 'VUT', 0, NOW(), NOW()), -(187, NULL, '862', 'VE', 'VEN', 0, NOW(), NOW()), -(188, NULL, '704', 'VN', 'VNM', 0, NOW(), NOW()), -(189, NULL, '887', 'YE', 'YEM', 0, NOW(), NOW()), -(191, NULL, '180', 'CD', 'COD', 0, NOW(), NOW()), -(192, NULL, '894', 'ZM', 'ZMB', 0, NOW(), NOW()), -(193, NULL, '716', 'ZW', 'ZWE', 0, NOW(), NOW()), -(196, NULL, '840', 'US', 'USA', 0, NOW(), NOW()), -(197, NULL, '840', 'US', 'USA', 0, NOW(), NOW()), -(198, NULL, '840', 'US', 'USA', 0, NOW(), NOW()), -(199, NULL, '840', 'US', 'USA', 0, NOW(), NOW()), -(200, NULL, '840', 'US', 'USA', 0, NOW(), NOW()), -(201, NULL, '840', 'US', 'USA', 0, NOW(), NOW()), -(202, NULL, '840', 'US', 'USA', 0, NOW(), NOW()), -(203, NULL, '840', 'US', 'USA', 0, NOW(), NOW()), -(204, NULL, '840', 'US', 'USA', 0, NOW(), NOW()), -(205, NULL, '840', 'US', 'USA', 0, NOW(), NOW()), -(206, NULL, '840', 'US', 'USA', 0, NOW(), NOW()), -(207, NULL, '840', 'US', 'USA', 0, NOW(), NOW()), -(208, NULL, '840', 'US', 'USA', 0, NOW(), NOW()), -(209, NULL, '840', 'US', 'USA', 0, NOW(), NOW()), -(210, NULL, '840', 'US', 'USA', 0, NOW(), NOW()), -(211, NULL, '840', 'US', 'USA', 0, NOW(), NOW()), -(212, NULL, '840', 'US', 'USA', 0, NOW(), NOW()), -(213, NULL, '840', 'US', 'USA', 0, NOW(), NOW()), -(214, NULL, '840', 'US', 'USA', 0, NOW(), NOW()), -(215, NULL, '840', 'US', 'USA', 0, NOW(), NOW()), -(216, NULL, '840', 'US', 'USA', 0, NOW(), NOW()), -(217, NULL, '840', 'US', 'USA', 0, NOW(), NOW()), -(218, NULL, '840', 'US', 'USA', 0, NOW(), NOW()), -(219, NULL, '840', 'US', 'USA', 0, NOW(), NOW()), -(220, NULL, '840', 'US', 'USA', 0, NOW(), NOW()), -(221, NULL, '840', 'US', 'USA', 0, NOW(), NOW()), -(222, NULL, '840', 'US', 'USA', 0, NOW(), NOW()), -(223, NULL, '840', 'US', 'USA', 0, NOW(), NOW()), -(224, NULL, '840', 'US', 'USA', 0, NOW(), NOW()), -(225, NULL, '840', 'US', 'USA', 0, NOW(), NOW()), -(226, NULL, '840', 'US', 'USA', 0, NOW(), NOW()), -(227, NULL, '840', 'US', 'USA', 0, NOW(), NOW()), -(228, NULL, '840', 'US', 'USA', 0, NOW(), NOW()), -(229, NULL, '840', 'US', 'USA', 0, NOW(), NOW()), -(230, NULL, '840', 'US', 'USA', 0, NOW(), NOW()), -(231, NULL, '840', 'US', 'USA', 0, NOW(), NOW()), -(232, NULL, '840', 'US', 'USA', 0, NOW(), NOW()), -(233, NULL, '840', 'US', 'USA', 0, NOW(), NOW()), -(234, NULL, '840', 'US', 'USA', 0, NOW(), NOW()), -(235, NULL, '840', 'US', 'USA', 0, NOW(), NOW()), -(236, NULL, '840', 'US', 'USA', 0, NOW(), NOW()), -(237, NULL, '840', 'US', 'USA', 0, NOW(), NOW()), -(238, NULL, '840', 'US', 'USA', 0, NOW(), NOW()), -(239, NULL, '840', 'US', 'USA', 0, NOW(), NOW()), -(240, NULL, '840', 'US', 'USA', 0, NOW(), NOW()), -(241, NULL, '840', 'US', 'USA', 0, NOW(), NOW()), -(242, NULL, '840', 'US', 'USA', 0, NOW(), NOW()), -(243, NULL, '840', 'US', 'USA', 0, NOW(), NOW()), -(244, NULL, '840', 'US', 'USA', 0, NOW(), NOW()), -(245, NULL, '840', 'US', 'USA', 0, NOW(), NOW()), -(246, NULL, '124', 'CA', 'CAN', 0, NOW(), NOW()), -(247, NULL, '124', 'CA', 'CAN', 0, NOW(), NOW()), -(248, NULL, '124', 'CA', 'CAN', 0, NOW(), NOW()), -(249, NULL, '124', 'CA', 'CAN', 0, NOW(), NOW()), -(250, NULL, '124', 'CA', 'CAN', 0, NOW(), NOW()), -(251, NULL, '124', 'CA', 'CAN', 0, NOW(), NOW()), -(252, NULL, '124', 'CA', 'CAN', 0, NOW(), NOW()), -(253, NULL, '124', 'CA', 'CAN', 0, NOW(), NOW()), -(254, NULL, '124', 'CA', 'CAN', 0, NOW(), NOW()), -(255, NULL, '124', 'CA', 'CAN', 0, NOW(), NOW()), -(256, NULL, '124', 'CA', 'CAN', 0, NOW(), NOW()), -(257, NULL, '124', 'CA', 'CAN', 0, NOW(), NOW()), -(258, NULL, '124', 'CA', 'CAN', 0, NOW(), NOW()), -(259, NULL, '312', 'GP', 'GLP', 0, NOW(), NOW()), -(260, NULL, '254', 'GF', 'GUF', 0, NOW(), NOW()), -(261, NULL, '474', 'MQ', 'MTQ', 0, NOW(), NOW()), -(262, NULL, '175', 'YT', 'MYT', 0, NOW(), NOW()), -(263, NULL, '638', 'RE', 'REU', 0, NOW(), NOW()), -(264, NULL, '666', 'PM', 'SPM', 0, NOW(), NOW()), -(265, NULL, '540', 'NC', 'NCL', 0, NOW(), NOW()), -(266, NULL, '258', 'PF', 'PYF', 0, NOW(), NOW()), -(267, NULL, '876', 'WF', 'WLF', 0, NOW(), NOW()), -(268, NULL, '840', 'US', 'USA', 0, NOW(), NOW()); +INSERT INTO `country` (`id`, `area_id`, `isocode`, `isoalpha2`, `isoalpha3`, `by_default`, `shop_country`, `created_at`, `updated_at`) VALUES +(1, NULL, '4', 'AF', 'AFG', 0, 0, NOW(), NOW()), +(2, NULL, '710', 'ZA', 'ZAF', 0, 0, NOW(), NOW()), +(3, NULL, '8', 'AL', 'ALB', 0, 0, NOW(), NOW()), +(4, NULL, '12', 'DZ', 'DZA', 0, 0, NOW(), NOW()), +(5, NULL, '276', 'DE', 'DEU', 0, 0, NOW(), NOW()), +(6, NULL, '20', 'AD', 'AND', 0, 0, NOW(), NOW()), +(7, NULL, '24', 'AO', 'AGO', 0, 0, NOW(), NOW()), +(8, NULL, '28', 'AG', 'ATG', 0, 0, NOW(), NOW()), +(9, NULL, '682', 'SA', 'SAU', 0, 0, NOW(), NOW()), +(10, NULL, '32', 'AR', 'ARG', 0, 0, NOW(), NOW()), +(11, NULL, '51', 'AM', 'ARM', 0, 0, NOW(), NOW()), +(12, NULL, '36', 'AU', 'AUS', 0, 0, NOW(), NOW()), +(13, NULL, '40', 'AT', 'AUT', 0, 0, NOW(), NOW()), +(14, NULL, '31', 'AZ', 'AZE', 0, 0, NOW(), NOW()), +(15, NULL, '44', 'BS', 'BHS', 0, 0, NOW(), NOW()), +(16, NULL, '48', 'BR', 'BHR', 0, 0, NOW(), NOW()), +(17, NULL, '50', 'BD', 'BGD', 0, 0, NOW(), NOW()), +(18, NULL, '52', 'BB', 'BRB', 0, 0, NOW(), NOW()), +(19, NULL, '585', 'PW', 'PLW', 0, 0, NOW(), NOW()), +(20, NULL, '56', 'BE', 'BEL', 0, 0, NOW(), NOW()), +(21, NULL, '84', 'BL', 'BLZ', 0, 0, NOW(), NOW()), +(22, NULL, '204', 'BJ', 'BEN', 0, 0, NOW(), NOW()), +(23, NULL, '64', 'BT', 'BTN', 0, 0, NOW(), NOW()), +(24, NULL, '112', 'BY', 'BLR', 0, 0, NOW(), NOW()), +(25, NULL, '104', 'MM', 'MMR', 0, 0, NOW(), NOW()), +(26, NULL, '68', 'BO', 'BOL', 0, 0, NOW(), NOW()), +(27, NULL, '70', 'BA', 'BIH', 0, 0, NOW(), NOW()), +(28, NULL, '72', 'BW', 'BWA', 0, 0, NOW(), NOW()), +(29, NULL, '76', 'BR', 'BRA', 0, 0, NOW(), NOW()), +(30, NULL, '96', 'BN', 'BRN', 0, 0, NOW(), NOW()), +(31, NULL, '100', 'BG', 'BGR', 0, 0, NOW(), NOW()), +(32, NULL, '854', 'BF', 'BFA', 0, 0, NOW(), NOW()), +(33, NULL, '108', 'BI', 'BDI', 0, 0, NOW(), NOW()), +(34, NULL, '116', 'KH', 'KHM', 0, 0, NOW(), NOW()), +(35, NULL, '120', 'CM', 'CMR', 0, 0, NOW(), NOW()), +(37, NULL, '132', 'CV', 'CPV', 0, 0, NOW(), NOW()), +(38, NULL, '152', 'CL', 'CHL', 0, 0, NOW(), NOW()), +(39, NULL, '156', 'CN', 'CHN', 0, 0, NOW(), NOW()), +(40, NULL, '196', 'CY', 'CYP', 0, 0, NOW(), NOW()), +(41, NULL, '170', 'CO', 'COL', 0, 0, NOW(), NOW()), +(42, NULL, '174', 'KM', 'COM', 0, 0, NOW(), NOW()), +(43, NULL, '178', 'CG', 'COG', 0, 0, NOW(), NOW()), +(44, NULL, '184', 'CK', 'COK', 0, 0, NOW(), NOW()), +(45, NULL, '408', 'KP', 'PRK', 0, 0, NOW(), NOW()), +(46, NULL, '410', 'KR', 'KOR', 0, 0, NOW(), NOW()), +(47, NULL, '188', 'CR', 'CRI', 0, 0, NOW(), NOW()), +(48, NULL, '384', 'CI', 'CIV', 0, 0, NOW(), NOW()), +(49, NULL, '191', 'HR', 'HRV', 0, 0, NOW(), NOW()), +(50, NULL, '192', 'CU', 'CUB', 0, 0, NOW(), NOW()), +(51, NULL, '208', 'DK', 'DNK', 0, 0, NOW(), NOW()), +(52, NULL, '262', 'DJ', 'DJI', 0, 0, NOW(), NOW()), +(53, NULL, '212', 'DM', 'DMA', 0, 0, NOW(), NOW()), +(54, NULL, '818', 'EG', 'EGY', 0, 0, NOW(), NOW()), +(55, NULL, '784', 'AE', 'ARE', 0, 0, NOW(), NOW()), +(56, NULL, '218', 'EC', 'ECU', 0, 0, NOW(), NOW()), +(57, NULL, '232', 'ER', 'ERI', 0, 0, NOW(), NOW()), +(58, NULL, '724', 'ES', 'ESP', 0, 0, NOW(), NOW()), +(59, NULL, '233', 'EE', 'EST', 0, 0, NOW(), NOW()), +(61, NULL, '231', 'ET', 'ETH', 0, 0, NOW(), NOW()), +(62, NULL, '242', 'FJ', 'FJI', 0, 0, NOW(), NOW()), +(63, NULL, '246', 'FI', 'FIN', 0, 0, NOW(), NOW()), +(64, 1, '250', 'FR', 'FRA', 1, 1, NOW(), NOW()), +(65, NULL, '266', 'GA', 'GAB', 0, 0, NOW(), NOW()), +(66, NULL, '270', 'GM', 'GMB', 0, 0, NOW(), NOW()), +(67, NULL, '268', 'GE', 'GEO', 0, 0, NOW(), NOW()), +(68, NULL, '288', 'GH', 'GHA', 0, 0, NOW(), NOW()), +(69, NULL, '300', 'GR', 'GRC', 0, 0, NOW(), NOW()), +(70, NULL, '308', 'GD', 'GRD', 0, 0, NOW(), NOW()), +(71, NULL, '320', 'GT', 'GTM', 0, 0, NOW(), NOW()), +(72, NULL, '324', 'GN', 'GIN', 0, 0, NOW(), NOW()), +(73, NULL, '624', 'GW', 'GNB', 0, 0, NOW(), NOW()), +(74, NULL, '226', 'GQ', 'GNQ', 0, 0, NOW(), NOW()), +(75, NULL, '328', 'GY', 'GUY', 0, 0, NOW(), NOW()), +(76, NULL, '332', 'HT', 'HTI', 0, 0, NOW(), NOW()), +(77, NULL, '340', 'HN', 'HND', 0, 0, NOW(), NOW()), +(78, NULL, '348', 'HU', 'HUN', 0, 0, NOW(), NOW()), +(79, NULL, '356', 'IN', 'IND', 0, 0, NOW(), NOW()), +(80, NULL, '360', 'ID', 'IDN', 0, 0, NOW(), NOW()), +(81, NULL, '364', 'IR', 'IRN', 0, 0, NOW(), NOW()), +(82, NULL, '368', 'IQ', 'IRQ', 0, 0, NOW(), NOW()), +(83, NULL, '372', 'IE', 'IRL', 0, 0, NOW(), NOW()), +(84, NULL, '352', 'IS', 'ISL', 0, 0, NOW(), NOW()), +(85, NULL, '376', 'IL', 'ISR', 0, 0, NOW(), NOW()), +(86, NULL, '380', 'IT', 'ITA', 0, 0, NOW(), NOW()), +(87, NULL, '388', 'JM', 'JAM', 0, 0, NOW(), NOW()), +(88, NULL, '392', 'JP', 'JPN', 0, 0, NOW(), NOW()), +(89, NULL, '400', 'JO', 'JOR', 0, 0, NOW(), NOW()), +(90, NULL, '398', 'KZ', 'KAZ', 0, 0, NOW(), NOW()), +(91, NULL, '404', 'KE', 'KEN', 0, 0, NOW(), NOW()), +(92, NULL, '417', 'KG', 'KGZ', 0, 0, NOW(), NOW()), +(93, NULL, '296', 'KI', 'KIR', 0, 0, NOW(), NOW()), +(94, NULL, '414', 'KW', 'KWT', 0, 0, NOW(), NOW()), +(95, NULL, '418', 'LA', 'LAO', 0, 0, NOW(), NOW()), +(96, NULL, '426', 'LS', 'LSO', 0, 0, NOW(), NOW()), +(97, NULL, '428', 'LV', 'LVA', 0, 0, NOW(), NOW()), +(98, NULL, '422', 'LB', 'LBN', 0, 0, NOW(), NOW()), +(99, NULL, '430', 'LR', 'LBR', 0, 0, NOW(), NOW()), +(100, NULL, '343', 'LY', 'LBY', 0, 0, NOW(), NOW()), +(101, NULL, '438', 'LI', 'LIE', 0, 0, NOW(), NOW()), +(102, NULL, '440', 'LT', 'LTU', 0, 0, NOW(), NOW()), +(103, NULL, '442', 'LU', 'LUX', 0, 0, NOW(), NOW()), +(104, NULL, '807', 'MK', 'MKD', 0, 0, NOW(), NOW()), +(105, NULL, '450', 'MD', 'MDG', 0, 0, NOW(), NOW()), +(106, NULL, '458', 'MY', 'MYS', 0, 0, NOW(), NOW()), +(107, NULL, '454', 'MW', 'MWI', 0, 0, NOW(), NOW()), +(108, NULL, '462', 'MV', 'MDV', 0, 0, NOW(), NOW()), +(109, NULL, '466', 'ML', 'MLI', 0, 0, NOW(), NOW()), +(110, NULL, '470', 'MT', 'MLT', 0, 0, NOW(), NOW()), +(111, NULL, '504', 'MA', 'MAR', 0, 0, NOW(), NOW()), +(112, NULL, '584', 'MH', 'MHL', 0, 0, NOW(), NOW()), +(113, NULL, '480', 'MU', 'MUS', 0, 0, NOW(), NOW()), +(114, NULL, '478', 'MR', 'MRT', 0, 0, NOW(), NOW()), +(115, NULL, '484', 'MX', 'MEX', 0, 0, NOW(), NOW()), +(116, NULL, '583', 'FM', 'FSM', 0, 0, NOW(), NOW()), +(117, NULL, '498', 'MD', 'MDA', 0, 0, NOW(), NOW()), +(118, NULL, '492', 'MC', 'MCO', 0, 0, NOW(), NOW()), +(119, NULL, '496', 'MN', 'MNG', 0, 0, NOW(), NOW()), +(120, NULL, '508', 'MZ', 'MOZ', 0, 0, NOW(), NOW()), +(121, NULL, '516', 'NA', 'NAM', 0, 0, NOW(), NOW()), +(122, NULL, '520', 'NR', 'NRU', 0, 0, NOW(), NOW()), +(123, NULL, '524', 'NP', 'NPL', 0, 0, NOW(), NOW()), +(124, NULL, '558', 'NI', 'NIC', 0, 0, NOW(), NOW()), +(125, NULL, '562', 'NE', 'NER', 0, 0, NOW(), NOW()), +(126, NULL, '566', 'NG', 'NGA', 0, 0, NOW(), NOW()), +(127, NULL, '570', 'NU', 'NIU', 0, 0, NOW(), NOW()), +(128, NULL, '578', 'NO', 'NOR', 0, 0, NOW(), NOW()), +(129, NULL, '554', 'NZ', 'NZL', 0, 0, NOW(), NOW()), +(130, NULL, '512', 'OM', 'OMN', 0, 0, NOW(), NOW()), +(131, NULL, '800', 'UG', 'UGA', 0, 0, NOW(), NOW()), +(132, NULL, '860', 'UZ', 'UZB', 0, 0, NOW(), NOW()), +(133, NULL, '586', 'PK', 'PAK', 0, 0, NOW(), NOW()), +(134, NULL, '591', 'PA', 'PAN', 0, 0, NOW(), NOW()), +(135, NULL, '598', 'PG', 'PNG', 0, 0, NOW(), NOW()), +(136, NULL, '600', 'PY', 'PRY', 0, 0, NOW(), NOW()), +(137, NULL, '528', 'NL', 'NLD', 0, 0, NOW(), NOW()), +(138, NULL, '604', 'PE', 'PER', 0, 0, NOW(), NOW()), +(139, NULL, '608', 'PH', 'PHL', 0, 0, NOW(), NOW()), +(140, NULL, '616', 'PL', 'POL', 0, 0, NOW(), NOW()), +(141, NULL, '620', 'PT', 'PRT', 0, 0, NOW(), NOW()), +(142, NULL, '634', 'QA', 'QAT', 0, 0, NOW(), NOW()), +(143, NULL, '140', 'CF', 'CAF', 0, 0, NOW(), NOW()), +(144, NULL, '214', 'DO', 'DOM', 0, 0, NOW(), NOW()), +(145, NULL, '203', 'CZ', 'CZE', 0, 0, NOW(), NOW()), +(146, NULL, '642', 'RO', 'ROU', 0, 0, NOW(), NOW()), +(147, NULL, '826', 'GB', 'GBR', 0, 0, NOW(), NOW()), +(148, NULL, '643', 'RU', 'RUS', 0, 0, NOW(), NOW()), +(149, NULL, '646', 'RW', 'RWA', 0, 0, NOW(), NOW()), +(150, NULL, '659', 'KN', 'KNA', 0, 0, NOW(), NOW()), +(151, NULL, '662', 'LC', 'LCA', 0, 0, NOW(), NOW()), +(152, NULL, '674', 'SM', 'SMR', 0, 0, NOW(), NOW()), +(153, NULL, '670', 'VC', 'VCT', 0, 0, NOW(), NOW()), +(154, NULL, '90', 'SB', 'SLB', 0, 0, NOW(), NOW()), +(155, NULL, '222', 'SV', 'SLV', 0, 0, NOW(), NOW()), +(156, NULL, '882', 'WS', 'WSM', 0, 0, NOW(), NOW()), +(157, NULL, '678', 'ST', 'STP', 0, 0, NOW(), NOW()), +(158, NULL, '686', 'SN', 'SEN', 0, 0, NOW(), NOW()), +(159, NULL, '690', 'SC', 'SYC', 0, 0, NOW(), NOW()), +(160, NULL, '694', 'SL', 'SLE', 0, 0, NOW(), NOW()), +(161, NULL, '702', 'SG', 'SGP', 0, 0, NOW(), NOW()), +(162, NULL, '703', 'SK', 'SVK', 0, 0, NOW(), NOW()), +(163, NULL, '705', 'SI', 'SVN', 0, 0, NOW(), NOW()), +(164, NULL, '706', 'SO', 'SOM', 0, 0, NOW(), NOW()), +(165, NULL, '729', 'SD', 'SDN', 0, 0, NOW(), NOW()), +(166, NULL, '144', 'LK', 'LKA', 0, 0, NOW(), NOW()), +(167, NULL, '752', 'SE', 'SWE', 0, 0, NOW(), NOW()), +(168, NULL, '756', 'CH', 'CHE', 0, 0, NOW(), NOW()), +(169, NULL, '740', 'SR', 'SUR', 0, 0, NOW(), NOW()), +(170, NULL, '748', 'SZ', 'SWZ', 0, 0, NOW(), NOW()), +(171, NULL, '760', 'SY', 'SYR', 0, 0, NOW(), NOW()), +(172, NULL, '762', 'TJ', 'TJK', 0, 0, NOW(), NOW()), +(173, NULL, '834', 'TZ', 'TZA', 0, 0, NOW(), NOW()), +(174, NULL, '148', 'TD', 'TCD', 0, 0, NOW(), NOW()), +(175, NULL, '764', 'TH', 'THA', 0, 0, NOW(), NOW()), +(176, NULL, '768', 'TG', 'TGO', 0, 0, NOW(), NOW()), +(177, NULL, '776', 'TO', 'TON', 0, 0, NOW(), NOW()), +(178, NULL, '780', 'TT', 'TTO', 0, 0, NOW(), NOW()), +(179, NULL, '788', 'TN', 'TUN', 0, 0, NOW(), NOW()), +(180, NULL, '795', 'TM', 'TKM', 0, 0, NOW(), NOW()), +(181, NULL, '792', 'TR', 'TUR', 0, 0, NOW(), NOW()), +(182, NULL, '798', 'TV', 'TUV', 0, 0, NOW(), NOW()), +(183, NULL, '804', 'UA', 'UKR', 0, 0, NOW(), NOW()), +(184, NULL, '858', 'UY', 'URY', 0, 0, NOW(), NOW()), +(185, NULL, '336', 'VA', 'VAT', 0, 0, NOW(), NOW()), +(186, NULL, '548', 'VU', 'VUT', 0, 0, NOW(), NOW()), +(187, NULL, '862', 'VE', 'VEN', 0, 0, NOW(), NOW()), +(188, NULL, '704', 'VN', 'VNM', 0, 0, NOW(), NOW()), +(189, NULL, '887', 'YE', 'YEM', 0, 0, NOW(), NOW()), +(190, NULL, '807', 'MK', 'MKD', 0, 0, NOW(), NOW()), +(191, NULL, '180', 'CD', 'COD', 0, 0, NOW(), NOW()), +(192, NULL, '894', 'ZM', 'ZMB', 0, 0, NOW(), NOW()), +(193, NULL, '716', 'ZW', 'ZWE', 0, 0, NOW(), NOW()), +(196, NULL, '840', 'US', 'USA', 0, 0, NOW(), NOW()), +(197, NULL, '840', 'US', 'USA', 0, 0, NOW(), NOW()), +(198, NULL, '840', 'US', 'USA', 0, 0, NOW(), NOW()), +(199, NULL, '840', 'US', 'USA', 0, 0, NOW(), NOW()), +(200, NULL, '840', 'US', 'USA', 0, 0, NOW(), NOW()), +(201, NULL, '840', 'US', 'USA', 0, 0, NOW(), NOW()), +(202, NULL, '840', 'US', 'USA', 0, 0, NOW(), NOW()), +(203, NULL, '840', 'US', 'USA', 0, 0, NOW(), NOW()), +(204, NULL, '840', 'US', 'USA', 0, 0, NOW(), NOW()), +(205, NULL, '840', 'US', 'USA', 0, 0, NOW(), NOW()), +(206, NULL, '840', 'US', 'USA', 0, 0, NOW(), NOW()), +(207, NULL, '840', 'US', 'USA', 0, 0, NOW(), NOW()), +(208, NULL, '840', 'US', 'USA', 0, 0, NOW(), NOW()), +(209, NULL, '840', 'US', 'USA', 0, 0, NOW(), NOW()), +(210, NULL, '840', 'US', 'USA', 0, 0, NOW(), NOW()), +(211, NULL, '840', 'US', 'USA', 0, 0, NOW(), NOW()), +(212, NULL, '840', 'US', 'USA', 0, 0, NOW(), NOW()), +(213, NULL, '840', 'US', 'USA', 0, 0, NOW(), NOW()), +(214, NULL, '840', 'US', 'USA', 0, 0, NOW(), NOW()), +(215, NULL, '840', 'US', 'USA', 0, 0, NOW(), NOW()), +(216, NULL, '840', 'US', 'USA', 0, 0, NOW(), NOW()), +(217, NULL, '840', 'US', 'USA', 0, 0, NOW(), NOW()), +(218, NULL, '840', 'US', 'USA', 0, 0, NOW(), NOW()), +(219, NULL, '840', 'US', 'USA', 0, 0, NOW(), NOW()), +(220, NULL, '840', 'US', 'USA', 0, 0, NOW(), NOW()), +(221, NULL, '840', 'US', 'USA', 0, 0, NOW(), NOW()), +(222, NULL, '840', 'US', 'USA', 0, 0, NOW(), NOW()), +(223, NULL, '840', 'US', 'USA', 0, 0, NOW(), NOW()), +(224, NULL, '840', 'US', 'USA', 0, 0, NOW(), NOW()), +(225, NULL, '840', 'US', 'USA', 0, 0, NOW(), NOW()), +(226, NULL, '840', 'US', 'USA', 0, 0, NOW(), NOW()), +(227, NULL, '840', 'US', 'USA', 0, 0, NOW(), NOW()), +(228, NULL, '840', 'US', 'USA', 0, 0, NOW(), NOW()), +(229, NULL, '840', 'US', 'USA', 0, 0, NOW(), NOW()), +(230, NULL, '840', 'US', 'USA', 0, 0, NOW(), NOW()), +(231, NULL, '840', 'US', 'USA', 0, 0, NOW(), NOW()), +(232, NULL, '840', 'US', 'USA', 0, 0, NOW(), NOW()), +(233, NULL, '840', 'US', 'USA', 0, 0, NOW(), NOW()), +(234, NULL, '840', 'US', 'USA', 0, 0, NOW(), NOW()), +(235, NULL, '840', 'US', 'USA', 0, 0, NOW(), NOW()), +(236, NULL, '840', 'US', 'USA', 0, 0, NOW(), NOW()), +(237, NULL, '840', 'US', 'USA', 0, 0, NOW(), NOW()), +(238, NULL, '840', 'US', 'USA', 0, 0, NOW(), NOW()), +(239, NULL, '840', 'US', 'USA', 0, 0, NOW(), NOW()), +(240, NULL, '840', 'US', 'USA', 0, 0, NOW(), NOW()), +(241, NULL, '840', 'US', 'USA', 0, 0, NOW(), NOW()), +(242, NULL, '840', 'US', 'USA', 0, 0, NOW(), NOW()), +(243, NULL, '840', 'US', 'USA', 0, 0, NOW(), NOW()), +(244, NULL, '840', 'US', 'USA', 0, 0, NOW(), NOW()), +(245, NULL, '840', 'US', 'USA', 0, 0, NOW(), NOW()), +(246, NULL, '124', 'CA', 'CAN', 0, 0, NOW(), NOW()), +(247, NULL, '124', 'CA', 'CAN', 0, 0, NOW(), NOW()), +(248, NULL, '124', 'CA', 'CAN', 0, 0, NOW(), NOW()), +(249, NULL, '124', 'CA', 'CAN', 0, 0, NOW(), NOW()), +(250, NULL, '124', 'CA', 'CAN', 0, 0, NOW(), NOW()), +(251, NULL, '124', 'CA', 'CAN', 0, 0, NOW(), NOW()), +(252, NULL, '124', 'CA', 'CAN', 0, 0, NOW(), NOW()), +(253, NULL, '124', 'CA', 'CAN', 0, 0, NOW(), NOW()), +(254, NULL, '124', 'CA', 'CAN', 0, 0, NOW(), NOW()), +(255, NULL, '124', 'CA', 'CAN', 0, 0, NOW(), NOW()), +(256, NULL, '124', 'CA', 'CAN', 0, 0, NOW(), NOW()), +(257, NULL, '124', 'CA', 'CAN', 0, 0, NOW(), NOW()), +(258, NULL, '124', 'CA', 'CAN', 0, 0, NOW(), NOW()), +(259, NULL, '312', 'GP', 'GLP', 0, 0, NOW(), NOW()), +(260, NULL, '254', 'GF', 'GUF', 0, 0, NOW(), NOW()), +(261, NULL, '474', 'MQ', 'MTQ', 0, 0, NOW(), NOW()), +(262, NULL, '175', 'YT', 'MYT', 0, 0, NOW(), NOW()), +(263, NULL, '638', 'RE', 'REU', 0, 0, NOW(), NOW()), +(264, NULL, '666', 'PM', 'SPM', 0, 0, NOW(), NOW()), +(265, NULL, '540', 'NC', 'NCL', 0, 0, NOW(), NOW()), +(266, NULL, '258', 'PF', 'PYF', 0, 0, NOW(), NOW()), +(267, NULL, '876', 'WF', 'WLF', 0, 0, NOW(), NOW()), +(268, NULL, '840', 'US', 'USA', 0, 0, NOW(), NOW()); INSERT INTO `country_i18n` (`id`, `locale`, `title`, `description`, `chapo`, `postscriptum`) VALUES (1, 'en_US', 'Afghanistan', '', '', ''), diff --git a/install/thelia.sql b/install/thelia.sql index 23c828ba8..7fa114536 100755 --- a/install/thelia.sql +++ b/install/thelia.sql @@ -98,7 +98,8 @@ CREATE TABLE `country` `isocode` VARCHAR(4) NOT NULL, `isoalpha2` VARCHAR(2), `isoalpha3` VARCHAR(4), - `by_default` TINYINT, + `by_default` TINYINT DEFAULT 0, + `shop_country` TINYINT(1) DEFAULT 0 NOT NULL, `created_at` DATETIME, `updated_at` DATETIME, PRIMARY KEY (`id`), @@ -983,7 +984,7 @@ CREATE TABLE `admin` `created_at` DATETIME, `updated_at` DATETIME, PRIMARY KEY (`id`), - INDEX `fk_admin_profile_id` (`profile_id`), + INDEX `idx_admin_profile_id` (`profile_id`), CONSTRAINT `fk_admin_profile_id` FOREIGN KEY (`profile_id`) REFERENCES `profile` (`id`) @@ -1029,7 +1030,7 @@ CREATE TABLE `profile_module` ( `profile_id` INTEGER NOT NULL, `module_id` INTEGER NOT NULL, - `access` INTEGER DEFAULT 0 NOT NULL, + `access` TINYINT DEFAULT 0, `created_at` DATETIME, `updated_at` DATETIME, PRIMARY KEY (`profile_id`,`module_id`), @@ -1257,6 +1258,7 @@ CREATE TABLE `product_price` `currency_id` INTEGER NOT NULL, `price` FLOAT NOT NULL, `promo_price` FLOAT, + `from_default_currency` TINYINT(1) DEFAULT 0 NOT NULL, `created_at` DATETIME, `updated_at` DATETIME, PRIMARY KEY (`product_sale_elements_id`,`currency_id`), diff --git a/local/config/schema.xml b/local/config/schema.xml index a1b189a3a..61c4aabf5 100755 --- a/local/config/schema.xml +++ b/local/config/schema.xml @@ -1,1252 +1,1254 @@ - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - -
- - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - -
- - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - -
- - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - -
- - - - - -
- - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - -
- - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - -
- - - - - - - - -
- - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - -
- - - - - - - -
- - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - -
- - - - - -
- + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + +
+ + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + +
+ + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + +
+ + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + +
+ + + + + +
+ + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + +
+ + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + +
+ + + + + + + +
+ + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + +
+ + + + + +
+ diff --git a/templates/admin/default/assets/js/jquery.typewatch.js b/templates/admin/default/assets/js/jquery.typewatch.js new file mode 100644 index 000000000..13b754385 --- /dev/null +++ b/templates/admin/default/assets/js/jquery.typewatch.js @@ -0,0 +1,94 @@ +/* +* TypeWatch 2.2 +* +* Examples/Docs: github.com/dennyferra/TypeWatch +* +* Copyright(c) 2013 +* Denny Ferrassoli - dennyferra.com +* Charles Christolini +* +* Dual licensed under the MIT and GPL licenses: +* http://www.opensource.org/licenses/mit-license.php +* http://www.gnu.org/licenses/gpl.html +*/ + +(function(jQuery) { + jQuery.fn.typeWatch = function(o) { + // The default input types that are supported + var _supportedInputTypes = + ['TEXT', 'TEXTAREA', 'PASSWORD', 'TEL', 'SEARCH', 'URL', 'EMAIL', 'DATETIME', 'DATE', 'MONTH', 'WEEK', 'TIME', 'DATETIME-LOCAL', 'NUMBER', 'RANGE']; + + // Options + var options = jQuery.extend({ + wait: 750, + callback: function() { }, + highlight: true, + captureLength: 2, + inputTypes: _supportedInputTypes + }, o); + + function checkElement(timer, override) { + var value = jQuery(timer.el).val(); + + // Fire if text >= options.captureLength AND text != saved text OR if override AND text >= options.captureLength + if ((value.length >= options.captureLength && value.toUpperCase() != timer.text) + || (override && value.length >= options.captureLength)) + { + timer.text = value.toUpperCase(); + timer.cb.call(timer.el, value); + } + }; + + function watchElement(elem) { + var elementType = elem.type.toUpperCase(); + if (jQuery.inArray(elementType, options.inputTypes) >= 0) { + + // Allocate timer element + var timer = { + timer: null, + text: jQuery(elem).val().toUpperCase(), + cb: options.callback, + el: elem, + wait: options.wait + }; + + // Set focus action (highlight) + if (options.highlight) { + jQuery(elem).focus( + function() { + this.select(); + }); + } + + // Key watcher / clear and reset the timer + var startWatch = function(evt) { + var timerWait = timer.wait; + var overrideBool = false; + var evtElementType = this.type.toUpperCase(); + + // If enter key is pressed and not a TEXTAREA and matched inputTypes + if (typeof evt.keyCode != 'undefined' && evt.keyCode == 13 && evtElementType != 'TEXTAREA' && jQuery.inArray(evtElementType, options.inputTypes) >= 0) { + timerWait = 1; + overrideBool = true; + } + + var timerCallbackFx = function() { + checkElement(timer, overrideBool) + } + + // Clear timer + clearTimeout(timer.timer); + timer.timer = setTimeout(timerCallbackFx, timerWait); + }; + + jQuery(elem).on('keydown paste cut input', startWatch); + } + }; + + // Watch Each Element + return this.each(function() { + watchElement(this); + }); + + }; +})(jQuery); \ No newline at end of file diff --git a/templates/admin/default/includes/product-details-tab.html b/templates/admin/default/includes/product-details-tab.html index 409191708..738359a50 100644 --- a/templates/admin/default/includes/product-details-tab.html +++ b/templates/admin/default/includes/product-details-tab.html @@ -1,10 +1,20 @@
+ {$has_at_least_one_combination = false} + {$default_product_sale_element_id = 0} + {loop name="product.sales.elements.test" type="product_sale_elements" product=$product_id currency=$edit_currency_id backend_context="1"} + {loop name="product.combinations" type="attribute_combination" product_sale_elements="$ID"} + {$has_at_least_one_combination = true} + {/loop} + + {elseloop rel="product.combinations"} + {$default_product_sale_element_id = $ID} + {/elseloop} {/loop} - {elseloop rel="product.sales.elements.test"} - {form name="thelia.admin.product.details.modification"} + {if $has_at_least_one_combination == false} + {form name="thelia.admin.product_default_sale_element.update"} {include @@ -17,15 +27,27 @@ } {* Be sure to get the product ID, even if the form could not be validated *} - + {form_hidden_fields form=$form} - {form_field form=$form field='id'} - - {/form_field} + {form_field form=$form field='product_id'} + + {/form_field} + + {form_field form=$form field='product_sale_element_id'} + + {/form_field} + + {form_field form=$form field='isdefault'} + + {/form_field} + + {form_field form=$form field='reference'} + + {/form_field} {form_field form=$form field='success_url'} @@ -39,11 +61,41 @@ {form_field form=$form field='currency'} {/form_field} + + {$current_currency_is_default = $IS_DEFAULT} {/loop} -

{intl l='Default pricing'}

-

{intl l="The default pricing is used with product that do not have any combinations. It is also used for product with combinations which share the same pricing information"}

+ {if $form_error} +
+
+
{$form_error_message}
+
+
+ {/if} + +
+
+ {form_field form=$form field='tax_rule'} +
+ +
+ +
+ +
+ {/form_field} +
+
+ +

{intl l='Pricing'}

+ +

{intl l="The default pricing is used when no combination is defined."}

@@ -53,49 +105,93 @@

{intl l='Pricing'}

-

+

+ + {form_field form=$form field='use_exchange_rate'} + {if $current_currency_is_default} + + {$show_pricing_fields = true} + {else} +
+
+ +
+
+ {$show_pricing_fields = ($value == 0)} + {/if} + {/form_field} {form_field form=$form field='price'}
- +
- + {$currency_symbol}
{/form_field} - {form_field form=$form field='tax_rule'} -
- -
- -
- -
- {/form_field} - - {form_field form=$form field='price_with_tax'} -
- -
- - {$currency_symbol} -
-
- {/form_field} +
+ +
+ + {$currency_symbol} +
+
{module_include location='product_details_pricing_form'}
+ {* -- Details -------------------------------------------------- *} + +
+
+

{intl l='Details'}

+ + {form_field form=$form field='ean_code'} +
+ + +
+ +
+
+ {/form_field} + + {form_field form=$form field='weight'} +
+ + +
+ + {intl l="Kg"} +
+
+ {/form_field} + + {module_include location='product_details_shipping_form'} + + {form_field form=$form field='quantity'} +
+ + +
+ +
+
+ {/form_field} + + {module_include location='product_details_quantity_form'} +
+
+ + {* -- Promotion ------------------------------------------------- *}
@@ -104,15 +200,23 @@ {form_field form=$form field='sale_price'}
- +
- + {$currency_symbol}
{/form_field} +
+ +
+ + {$currency_symbol} +
+
+ {form_field form=$form field='onsale'}
@@ -138,54 +242,20 @@ {module_include location='product_details_promotion_form'}
- - - {* -- Shipping -------------------------------------------------- *} - -
-
-

{intl l='Shipping'}

- - {form_field form=$form field='weight'} -
- - -
- - {intl l="Kg"} -
-
- {/form_field} - - {module_include location='product_details_shipping_form'} - -

{intl l='Quantity'}

- - {form_field form=$form field='quantity'} -
- - -
- -
-
- {/form_field} - - {module_include location='product_details_quantity_form'} -
-
{/form} - {/elseloop} + {/if} {* -- Attribute combinations -------------------------------------------- *} -
-
+ {if $has_at_least_one_combination} - {ifloop rel="product.sales.elements"} -
+ {form name="thelia.admin.product_sale_element.update"} + + +
+
{include file = "includes/inner-form-toolbar.html" @@ -195,6 +265,26 @@ close_url = "{url path='/admin/categories' category_id=$DEFAULT_CATEGORY}" } + {if $form_error}
{$form_error_message}
{/if} + +
+
+ {form_field form=$form field='tax_rule'} +
+ +
+ +
+
+ {/form_field} +
+
+ {module_include location='product_before_combinations'} @@ -212,33 +302,38 @@ - - + + + - + - - + + - + {loop name="product.sales.elements" type="product_sale_elements" product=$product_id currency=$edit_currency_id backend_context="1"} + + + - - + + + - +
{intl l='Attributes'}{intl l='Quantity'}{intl l='Reference'}{intl l='EAN Code'}{intl l='Quantity'} {intl l='Price
w/o taxes (%currency)' currency=$currency_symbol}		 {intl l='Price
w/ taxes (%currency)' currency=$currency_symbol}		{intl l='Weight (Kg)'}{intl l='Weight
(Kg)'}		 {intl l='Default'}{intl l='Is new'}{intl l='On sale'}{intl l='New'}{intl l='Sale'} {intl l='Sale price
w/o taxes (%currency)' currency=$currency_symbol}		 {intl l='Sale price
w/ taxes (%currency)' currency=$currency_symbol}		{intl l='Actions'} 
+ {$ID}: {loop name="product.sales.elements.combinations" type="attribute_combination" product_sale_elements=$ID backend_context="1"} + {if $LOOP_COUNT > 1} - {/if}{$ATTRIBUTE_TITLE} + {/loop} +
- {loop name="product.sales.elements.combinations" type="attribute_combination" product_sale_elements=$ID backend_context="1"} - {$ATTRIBUTE_TITLE}  - {/loop} - @@ -263,26 +358,30 @@
- {module_include location='product_after_combinations'} - + {module_include location='product_after_combinations'} +
+
- {/ifloop} + + {/form} + {/if} - {elseloop rel="product.sales.elements"} -

{intl l='Attribute Combinations'}

+ {if $has_at_least_one_combination == false} +
+
+

{intl l='Attribute Combinations'}

-
- {intl - l='This product has no combination. The default price is used. Click here to create a new combination' - url='#combination_creation_dialog' - } -
- {/elseloop} +
+ {intl + l='This product has no combination. The default price is used. Click here to create a new combination' + url='#combination_creation_dialog' + } +
+
+
+ {/if} - {module_include location='product_after_combinations'} - -
-
+{module_include location='product_after_combinations'}
{* -- Adding a new combination ------------------------------------------------- *} @@ -310,7 +409,7 @@
{* *} - @@ -381,7 +480,7 @@ file = "includes/generic-confirm-dialog.html" dialog_id = "combination_delete_dialog" - dialog_title = {intl l="Delete a combunation"} + dialog_title = {intl l="Delete a combination"} dialog_message = {intl l="Do you really want to delete this combination ?"} form_action = {url path='/admin/product/combination/delete'} diff --git a/templates/admin/default/product-edit.html b/templates/admin/default/product-edit.html index 75b85c82b..2a2d94ca8 100644 --- a/templates/admin/default/product-edit.html +++ b/templates/admin/default/product-edit.html @@ -136,12 +136,16 @@ {/javascripts} + {javascripts file='assets/js/bootstrap-switch/bootstrap-switch.js'} + + {/javascripts} -{javascripts file='assets/js/bootstrap-switch/bootstrap-switch.js'} - -{/javascripts} + {javascripts file='assets/js/jquery.typewatch.js'} + + {/javascripts} +