diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 0000000..5008ddf Binary files /dev/null and b/.DS_Store differ diff --git a/AdminIncludes/order-edit.html b/AdminIncludes/order-edit.html index 2c45310..e5360de 100755 --- a/AdminIncludes/order-edit.html +++ b/AdminIncludes/order-edit.html @@ -8,7 +8,7 @@
- {form name="socolissimo.export.inet"} + {form name="socolissimo.export"}
{form_hidden_fields form=$form} {form_field form=$form field="new_status_id"} diff --git a/CHANGELOG.md b/CHANGELOG.md index 7b833c9..8bb6bcd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +# 2.0.0 +- Bugfixes +- Domicile delivery is now deprecated and will not be updated or taken care of anymore. +Use the ColissimoWs module instead for domicile delivery, and this one for relay point. +- Change version to 2.0.0 to follow the version number of ColissimoWs + # 1.4.7 - Changing a relay point Free Shipping for a specific area does not add the price for every other area anymore. diff --git a/Config/module.xml b/Config/module.xml index 4a30fb3..cbce37f 100755 --- a/Config/module.xml +++ b/Config/module.xml @@ -7,7 +7,7 @@ So Colissimo - 1.4.11 + 2.0.0 Thelia info@thelia.net diff --git a/Config/schema.xml b/Config/schema.xml index e5bb8e7..c3c049c 100755 --- a/Config/schema.xml +++ b/Config/schema.xml @@ -1,5 +1,6 @@ + @@ -22,6 +23,7 @@
+ @@ -30,6 +32,7 @@
+ @@ -37,6 +40,7 @@
+ @@ -53,11 +57,12 @@
+ - + @@ -70,7 +75,7 @@ - + diff --git a/Config/sqldb.map b/Config/sqldb.map new file mode 100644 index 0000000..63a93ba --- /dev/null +++ b/Config/sqldb.map @@ -0,0 +1,2 @@ +# Sqlfile -> Database map +thelia.sql=thelia diff --git a/Config/thelia.sql b/Config/thelia.sql old mode 100755 new mode 100644 index f5205ec..c518701 --- a/Config/thelia.sql +++ b/Config/thelia.sql @@ -26,8 +26,8 @@ CREATE TABLE `address_socolissimo` `type` VARCHAR(10) NOT NULL, `cellphone` VARCHAR(20), PRIMARY KEY (`id`), - INDEX `FI_address_socolissimo_customer_title_id` (`title_id`), - INDEX `FI_address_socolissimo_country_id` (`country_id`), + INDEX `fi_address_socolissimo_customer_title_id` (`title_id`), + INDEX `fi_address_socolissimo_country_id` (`country_id`), CONSTRAINT `fk_address_socolissimo_customer_title_id` FOREIGN KEY (`title_id`) REFERENCES `customer_title` (`id`) @@ -91,8 +91,8 @@ CREATE TABLE `socolissimo_price` `franco_min_price` FLOAT, `price` FLOAT NOT NULL, PRIMARY KEY (`id`), - INDEX `FI_socolissimo_price_area_id` (`area_id`), - INDEX `FI_socolissimo_price_delivery_mode_id` (`delivery_mode_id`), + INDEX `fi_socolissimo_price_area_id` (`area_id`), + INDEX `fi_socolissimo_price_delivery_mode_id` (`delivery_mode_id`), CONSTRAINT `fk_socolissimo_price_area_id` FOREIGN KEY (`area_id`) REFERENCES `area` (`id`) @@ -116,10 +116,10 @@ CREATE TABLE `socolissimo_area_freeshipping_dom` `id` INTEGER NOT NULL AUTO_INCREMENT, `area_id` INTEGER NOT NULL, `delivery_mode_id` INTEGER NOT NULL, - `cart_amount` DECIMAL(16,6) DEFAULT 0.000000, + `cart_amount` DECIMAL(16,2) DEFAULT 0.00, PRIMARY KEY (`id`), - INDEX `FI_socolissimo_area_freeshipping_dom_area_id` (`area_id`), - INDEX `FI_socolissimo_area_freeshipping_dom_delivery_mode_id` (`delivery_mode_id`), + INDEX `fi_socolissimo_area_freeshipping_dom_area_id` (`area_id`), + INDEX `fi_socolissimo_area_freeshipping_dom_delivery_mode_id` (`delivery_mode_id`), CONSTRAINT `fk_socolissimo_area_freeshipping_dom_area_id` FOREIGN KEY (`area_id`) REFERENCES `area` (`id`) @@ -143,10 +143,10 @@ CREATE TABLE `socolissimo_area_freeshipping_pr` `id` INTEGER NOT NULL AUTO_INCREMENT, `area_id` INTEGER NOT NULL, `delivery_mode_id` INTEGER NOT NULL, - `cart_amount` DECIMAL(16,6) DEFAULT 0.000000, + `cart_amount` DECIMAL(16,2) DEFAULT 0.00, PRIMARY KEY (`id`), - INDEX `FI_socolissimo_area_freeshipping_pr_area_id` (`area_id`), - INDEX `FI_socolissimo_area_freeshipping_pr_delivery_mode_id` (`delivery_mode_id`), + INDEX `fi_socolissimo_area_freeshipping_pr_area_id` (`area_id`), + INDEX `fi_socolissimo_area_freeshipping_pr_delivery_mode_id` (`delivery_mode_id`), CONSTRAINT `fk_socolissimo_area_freeshipping_pr_area_id` FOREIGN KEY (`area_id`) REFERENCES `area` (`id`) diff --git a/Config/update/sql/2.0.0.sql b/Config/update/sql/2.0.0.sql new file mode 100644 index 0000000..fe99ac7 --- /dev/null +++ b/Config/update/sql/2.0.0.sql @@ -0,0 +1,15 @@ +SET FOREIGN_KEY_CHECKS = 0; +-- --------------------------------------------------------------------- +-- socolissimo_area_freeshipping_dom +-- --------------------------------------------------------------------- + +ALTER TABLE `socolissimo_area_freeshipping_dom` MODIFY `cart_amount` DECIMAL(18,2) DEFAULT 0.00 NULL; + +-- --------------------------------------------------------------------- +-- socolissimo_area_freeshipping_pr +-- --------------------------------------------------------------------- + +ALTER TABLE `socolissimo_area_freeshipping_pr` MODIFY `cart_amount` DECIMAL(18,2) DEFAULT 0.00 NULL; + +# This restores the fkey checks, after having unset them earlier +SET FOREIGN_KEY_CHECKS = 1; \ No newline at end of file diff --git a/Controller/GetSpecificLocation.php b/Controller/GetSpecificLocation.php index 56d53fe..28d81df 100755 --- a/Controller/GetSpecificLocation.php +++ b/Controller/GetSpecificLocation.php @@ -23,6 +23,7 @@ namespace SoColissimo\Controller; +use SoColissimo\SoColissimo; use SoColissimo\WebService\FindById; use Symfony\Component\HttpFoundation\JsonResponse; use Thelia\Controller\Front\BaseFrontController; @@ -59,8 +60,8 @@ public function getPointInfo($point_id) $req->setId($point_id) ->setLangue("FR") ->setDate(date("d/m/Y")) - ->setAccountNumber(ConfigQuery::read('socolissimo_login')) - ->setPassword(ConfigQuery::read('socolissimo_pwd')) + ->setAccountNumber(SoColissimo::getConfigValue('socolissimo_username')) + ->setPassword(SoColissimo::getConfigValue('socolissimo_password')) ; $response = $req->exec(); diff --git a/Controller/SaveConfig.php b/Controller/SaveConfig.php index 4968d59..6ca884a 100755 --- a/Controller/SaveConfig.php +++ b/Controller/SaveConfig.php @@ -2,6 +2,7 @@ namespace SoColissimo\Controller; +use SoColissimo\SoColissimo; use Thelia\Controller\Admin\BaseAdminController; use SoColissimo\Form\ConfigureSoColissimo; use Thelia\Core\Translation\Translator; @@ -22,12 +23,11 @@ public function save() try { $vform = $this->validateForm($form); - ConfigQuery::write('socolissimo_login', $vform->get('accountnumber')->getData(), 1, 1); - ConfigQuery::write('socolissimo_pwd', $vform->get('password')->getData(), 1, 1); - ConfigQuery::write('socolissimo_google_map_key', $vform->get('google_map_key')->getData(), 1, 1); - ConfigQuery::write('socolissimo_url_prod', $vform->get('url_prod')->getData(), 1, 1); - ConfigQuery::write('socolissimo_url_test', $vform->get('url_test')->getData(), 1, 1); - ConfigQuery::write('socolissimo_test_mode', $vform->get('test_mode')->getData(), 1, 1); + SoColissimo::setConfigValue('socolissimo_username', $vform->get('socolissimo_username')->getData()); + SoColissimo::setConfigValue('socolissimo_password', $vform->get('socolissimo_password')->getData()); + SoColissimo::setConfigValue('socolissimo_google_map_key', $vform->get('socolissimo_google_map_key')->getData()); + SoColissimo::setConfigValue('socolissimo_endpoint_url', $vform->get('socolissimo_endpoint_url')->getData()); + SoColissimo::setConfigValue('socolissimo_dom_delivery_authorized', $vform->get('socolissimo_dom_delivery_authorized')->getData()); return $this->generateRedirect( URL::getInstance()->absoluteUrl('/admin/module/SoColissimo', ['current_tab' => 'configure']) diff --git a/Controller/SliceController.php b/Controller/SliceController.php index ee72b6c..00f988d 100644 --- a/Controller/SliceController.php +++ b/Controller/SliceController.php @@ -8,14 +8,13 @@ use SoColissimo\SoColissimo; use Thelia\Controller\Admin\BaseAdminController; use Thelia\Core\Security\AccessManager; +use Thelia\Core\Security\Resource\AdminResources; class SliceController extends BaseAdminController { public function saveSliceAction() { - $response = $this->checkAuth([], ['socolissimo'], AccessManager::UPDATE); - - if (null !== $response) { + if (null !== $response = $this->checkAuth(array(AdminResources::MODULE), ['socolissimo'], AccessManager::UPDATE)) { return $response; } @@ -33,14 +32,14 @@ public function saveSliceAction() try { $requestData = $this->getRequest()->request; - if (0 !== $id = intval($requestData->get('id', 0))) { + if (0 !== $id = (int)$requestData->get('id', 0)) { $slice = SocolissimoPriceQuery::create()->findPk($id); } else { $slice = new SocolissimoPrice(); } - if (0 !== $areaId = intval($requestData->get('area', 0))) { + if (0 !== $areaId = (int)$requestData->get('area', 0)) { $slice->setAreaId($areaId); } else { $messages[] = $this->getTranslator()->trans( @@ -50,7 +49,7 @@ public function saveSliceAction() ); } - if (0 !== $deliveryMode = intval($requestData->get('deliveryModeId', 0))) { + if (0 !== $deliveryMode = (int)$requestData->get('deliveryModeId', 0)) { $slice->setDeliveryModeId($deliveryMode); } else { $messages[] = $this->getTranslator()->trans( @@ -143,7 +142,7 @@ protected function getFloatVal($val, $default = -1) $val = str_replace(".", "", $val); $val = str_replace(",", ".", $val); } - $val = floatval($val); + $val = (float)$val; return $val; } @@ -172,7 +171,7 @@ public function deleteSliceAction() try { $requestData = $this->getRequest()->request; - if (0 !== $id = intval($requestData->get('id', 0))) { + if (0 !== $id = (int)$requestData->get('id', 0)) { $slice = SocolissimoPriceQuery::create()->findPk($id); $slice->delete(); $responseData['success'] = true; diff --git a/Form/ConfigureSoColissimo.php b/Form/ConfigureSoColissimo.php index 059fb43..70e7c97 100755 --- a/Form/ConfigureSoColissimo.php +++ b/Form/ConfigureSoColissimo.php @@ -24,6 +24,8 @@ namespace SoColissimo\Form; use SoColissimo\SoColissimo; +use Symfony\Component\Form\Extension\Core\Type\CheckboxType; +use Symfony\Component\Form\Extension\Core\Type\TextType; use Symfony\Component\Validator\Constraints\NotBlank; use Symfony\Component\Validator\Constraints\Url; use Thelia\Core\Translation\Translator; @@ -62,28 +64,28 @@ protected function buildForm() $translator = Translator::getInstance(); $this->formBuilder ->add( - 'accountnumber', - 'text', + 'socolissimo_username', + TextType::class, [ 'constraints' => [new NotBlank()], - 'data' => ConfigQuery::read('socolissimo_login'), + 'data' => SoColissimo::getConfigValue('socolissimo_username'), 'label' => $translator->trans("Account number", [], SoColissimo::DOMAIN), - 'label_attr' => ['for' => 'accountnumber'] + 'label_attr' => ['for' => 'socolissimo_username'] ] ) ->add( - 'password', - 'text', + 'socolissimo_password', + TextType::class, [ 'constraints' => [new NotBlank()], - 'data' => ConfigQuery::read('socolissimo_pwd'), + 'data' => SoColissimo::getConfigValue('socolissimo_password'), 'label' => $translator->trans("Password", [], SoColissimo::DOMAIN), - 'label_attr' => ['for' => 'password'] + 'label_attr' => ['for' => 'socolissimo_password'] ] ) ->add( - 'url_prod', - 'text', + 'socolissimo_endpoint_url', + TextType::class, [ 'constraints' => [ new NotBlank(), @@ -91,44 +93,31 @@ protected function buildForm() 'protocols' => ['https', 'http'] ]) ], - 'data' => ConfigQuery::read('socolissimo_url_prod'), + 'data' => SoColissimo::getConfigValue('socolissimo_endpoint_url'), 'label' => $translator->trans("Colissimo URL prod", [], SoColissimo::DOMAIN), - 'label_attr' => ['for' => 'socolissimo_url_prod'] + 'label_attr' => ['for' => 'socolissimo_endpoint_url'] ] ) ->add( - 'url_test', - 'text', + 'socolissimo_google_map_key', + TextType::class, [ - 'constraints' => [ - new NotBlank(), - new Url([ - 'protocols' => ['https', 'http'] - ]) - ], - 'data' => ConfigQuery::read('socolissimo_url_test'), - 'label' => $translator->trans("Colissimo URL test", [], SoColissimo::DOMAIN), - 'label_attr' => ['for' => 'socolissimo_url_test'] - ] - ) - ->add( - 'test_mode', - 'text', - [ - 'constraints' => [new NotBlank()], - 'data' => ConfigQuery::read('socolissimo_test_mode'), - 'label' => $translator->trans("Test mode", [], SoColissimo::DOMAIN), - 'label_attr' => ['for' => 'test_mode'] + 'constraints' => [], + 'data' => SoColissimo::getConfigValue('socolissimo_google_map_key'), + 'label' => $translator->trans("Google map API key", [], SoColissimo::DOMAIN), + 'label_attr' => ['for' => 'socolissimo_google_map_key'] ] ) ->add( - 'google_map_key', - 'text', + 'socolissimo_dom_delivery_authorized', + CheckboxType::class, [ 'constraints' => [], - 'data' => ConfigQuery::read('socolissimo_google_map_key'), - 'label' => $translator->trans("Google map API key", [], SoColissimo::DOMAIN), - 'label_attr' => ['for' => 'google_map_key'] + 'required' => false, + 'data' => (bool)SoColissimo::getConfigValue('socolissimo_dom_delivery_authorized'), + 'value' => (bool)SoColissimo::getConfigValue('socolissimo_dom_delivery_authorized'), + 'label' => $translator->trans("[DEPRECATED] Activate Dom delivery", [], SoColissimo::DOMAIN), + 'label_attr' => ['for' => 'socolissimo_dom_delivery_authorized'] ] ) ; diff --git a/Form/FreeShipping.php b/Form/FreeShipping.php index cf771e9..909d7dc 100755 --- a/Form/FreeShipping.php +++ b/Form/FreeShipping.php @@ -23,7 +23,9 @@ namespace SoColissimo\Form; -use SoColissimo\Model\SocolissimoFreeshippingQuery; +use SoColissimo\SoColissimo; +use Symfony\Component\Form\Extension\Core\Type\CheckboxType; +use Symfony\Component\Form\Extension\Core\Type\IntegerType; use Thelia\Core\Translation\Translator; use Thelia\Form\BaseForm; @@ -52,10 +54,17 @@ class FreeShipping extends BaseForm protected function buildForm() { $this->formBuilder - ->add("delivery_mode", "integer") - ->add("freeshipping", "checkbox", array( - 'label'=>Translator::getInstance()->trans("Activate free shipping: ") - )) + ->add( + 'delivery_mode', + IntegerType::class + ) + ->add( + 'freeshipping', + CheckboxType::class, + [ + 'label' => Translator::getInstance()->trans("Activate free shipping: ", [], SoColissimo::DOMAIN) + ] + ) ; } diff --git a/I18n/backOffice/default/en_US.php b/I18n/backOffice/default/en_US.php index cba938a..44e8f8d 100644 --- a/I18n/backOffice/default/en_US.php +++ b/I18n/backOffice/default/en_US.php @@ -3,6 +3,7 @@ return array( '*If you choose this option, the exported orders would not be available on this page anymore' => '*If you choose this option, the exported orders would not be available on this page anymore', 'Actions' => 'Actions', + 'Activate free shipping from (€) :' => 'Activate free shipping from (€) :', 'Activate total free shipping ' => 'Activate total free shipping ', 'Add this price slice' => 'Add this price slice', 'Advanced configuration' => 'Advanced configuration', @@ -16,12 +17,14 @@ 'Do not change' => 'Do not change', 'Export' => 'Export', 'Export Coliship file' => 'Export Coliship file', + 'If a cart matches multiple slices, it will take the last slice following that order.' => 'If a cart matches multiple slices, it will take the last slice following that order.', 'If you don\'t specify a cart price in a slice, it will have priority over the other slices with the same weight.' => 'If you don\'t specify a cart price in a slice, it will have priority over the other slices with the same weight.', 'If you don\'t specify a cart weight in a slice, it will have priority over the slices with weight.' => 'If you don\'t specify a cart weight in a slice, it will have priority over the slices with weight.', + 'If you specify both, the cart will require to have a lower weight AND a lower price in order to match the slice.' => 'If you specify both, the cart will require to have a lower weight AND a lower price in order to match the slice.', 'Import Coliship file' => 'Import Coliship file', 'Message' => 'Message', + 'Only use this for compatibility reason or if you have no other choice. For domicile delivery, you should use ColissimoWs instead.' => 'Only use this for compatibility reason or if you have no other choice. For domicile delivery, you should use ColissimoWs instead.', 'Or activate free shipping from (€) :' => 'Or activate free shipping from (€) :', - 'PRODUCTION' => 'PRODUCTION', 'Package weight' => 'Package weight', 'Please change the access rights' => 'Please change the access rights', 'Price (%symbol)' => 'Price (%symbol)', @@ -33,7 +36,6 @@ 'Save changes' => 'Save changes', 'Save this price slice' => 'Save this price slice', 'Sent' => 'Sent', - 'TEST' => 'TEST', 'The file has to be a CSV with 2 columns. The first contains the delivery reference, the second the order reference.' => 'The file has to be a CSV with 2 columns. The first contains the delivery reference, the second the order reference.', 'The slices are ordered by maximum cart weight then by maximum cart price.' => 'The slices are ordered by maximum cart weight then by maximum cart price.', 'Total taxed amount' => 'Total taxed amount', diff --git a/I18n/backOffice/default/fr_FR.php b/I18n/backOffice/default/fr_FR.php index 8bca68d..8b65f35 100644 --- a/I18n/backOffice/default/fr_FR.php +++ b/I18n/backOffice/default/fr_FR.php @@ -3,8 +3,8 @@ return array( '*If you choose this option, the exported orders would not be available on this page anymore' => '* Si vous choisissez cette option, les commandes exportées n\'apparaitront plus dans cette page', 'Actions' => 'Actions', - 'Activate total free shipping ' => 'Activer les frais de port gratuits', 'Activate free shipping from (€) :' => 'Activer les frais de port gratuits à partir de (€)', + 'Activate total free shipping ' => 'Activer les frais de port gratuits', 'Add this price slice' => 'Ajouter cette tranche de prix', 'Advanced configuration' => 'Configuration avancée', 'An error occured' => 'Une erreur est survenue', @@ -23,8 +23,8 @@ 'If you specify both, the cart will require to have a lower weight AND a lower price in order to match the slice.' => 'Si vous renseignez les deux, le panier devra avoir à la fois un poids inférieur ET un prix inférieur pour correspondre à cette tranche.', 'Import Coliship file' => 'Import de fichier Coliship', 'Message' => 'Message', + 'Only use this for compatibility reason or if you have no other choice. For domicile delivery, you should use ColissimoWs instead.' => 'N\'utilisez ceci que pour des raisons de compatibilité ou si vous n\'avez pas d\'autres choix. Pour la livraison à domicile, utilisez plutôt désormais le module ColissimoWs', 'Or activate free shipping from (€) :' => 'Ou activer les frais de port gratuits à partir de (€)', - 'PRODUCTION' => 'PRODUCTION', 'Package weight' => 'Poids des colis (kg)', 'Please change the access rights' => 'Merci de modifier les droits d\'accès', 'Price (%symbol)' => 'Frais de livraison (%symbol)', @@ -36,7 +36,6 @@ 'Save changes' => 'Enregistrer les modifications', 'Save this price slice' => 'Enregistrer cette tranche de prix', 'Sent' => 'Envoyé', - 'TEST' => 'TEST', 'The file has to be a CSV with 2 columns. The first contains the delivery reference, the second the order reference.' => 'Le fichier doit être au format CSV et contenir 2 colonnes. La première indique les références colis, la seconde les références des commandes.', 'The slices are ordered by maximum cart weight then by maximum cart price.' => 'Les tranches sont triés pour poids de panier max puis par prix de panier max.', 'Total taxed amount' => 'Montant total (avec taxes)', diff --git a/I18n/en_US.php b/I18n/en_US.php index 3992e74..2204e8c 100644 --- a/I18n/en_US.php +++ b/I18n/en_US.php @@ -7,7 +7,6 @@ 'Can\'t read Config directory' => 'Can\'t read Config directory', 'Can\'t read file' => 'Can\'t read file', 'Colissimo URL prod' => 'Colissimo URL prod', - 'Colissimo URL test' => 'Colissimo URL test', 'Do not change' => 'Do not change', 'Google map API key' => 'Google map API key', 'No relay points were selected' => 'No relay points were selected', @@ -17,7 +16,6 @@ 'Set orders status as processing' => 'Set orders status as processing', 'Set orders status as sent' => 'Set orders status as sent', 'So Colissimo update config' => 'So Colissimo update config', - 'Test mode' => 'Test mode', 'The area is not valid' => 'The area is not valid', 'The delivery mode is not valid' => 'The delivery mode is not valid', 'The price max value is not valid' => 'The price max value is not valid', @@ -31,5 +29,6 @@ 'This delivery mode doesn\'t exists.' => 'This delivery mode doesn\'t exists.', 'You must specify at least a price max or a weight max value.' => 'You must specify at least a price max or a weight max value.', 'Your slice has been saved' => 'Your slice has been saved', + '[DEPRECATED] Activate Dom delivery' => '[DEPRECATED] Activate Dom delivery', 'server' => 'server', ); diff --git a/I18n/fr_FR.php b/I18n/fr_FR.php index 0462fdd..db0c01f 100755 --- a/I18n/fr_FR.php +++ b/I18n/fr_FR.php @@ -7,7 +7,6 @@ 'Can\'t read Config directory' => 'Le dossier Config ne peut être lu', 'Can\'t read file' => 'Le fichier suivant ne peut être lu', 'Colissimo URL prod' => 'URL de Colissimo en production', - 'Colissimo URL test' => 'URL de Colissimo en mode test', 'Do not change' => 'Ne pas changer', 'Google map API key' => 'Clé API Google map', 'No relay points were selected' => 'Aucun point relais n\'a été sélectionné', @@ -17,7 +16,6 @@ 'Set orders status as processing' => 'En traitement', 'Set orders status as sent' => 'Envoyée', 'So Colissimo update config' => 'Mise à jour de la configuration de So Colissimo ', - 'Test mode' => 'Mode test', 'The area is not valid' => 'La zone de livraison n\'est pas valide.', 'The delivery mode is not valid' => 'Le mode de livraison n\'est pas valide.', 'The price max value is not valid' => 'Le prix maximum n\'est pas valide.', @@ -31,5 +29,6 @@ 'This delivery mode doesn\'t exists.' => 'Ce mode de livraison n\'existe pas.', 'You must specify at least a price max or a weight max value.' => 'Vous devez spécifier au moins un prix maximum ou un poids maximum.', 'Your slice has been saved' => 'Votre tranche a été enregistrée.', + '[DEPRECATED] Activate Dom delivery' => '[DEPRECIE] Activer la livraison à domicile', 'server' => 'Serveur', ); diff --git a/Listener/SetDeliveryModule.php b/Listener/SetDeliveryModule.php index dbfe46d..9a9bbde 100755 --- a/Listener/SetDeliveryModule.php +++ b/Listener/SetDeliveryModule.php @@ -80,8 +80,8 @@ private function callWebServiceFindRelayPointByIdFromRequest(Request $request) $req->setId($pr_code) ->setLangue("FR") ->setDate(date("d/m/Y")) - ->setAccountNumber(ConfigQuery::read('socolissimo_login')) - ->setPassword(ConfigQuery::read('socolissimo_pwd')); + ->setAccountNumber(SoColissimo::getConfigValue('socolissimo_username')) + ->setPassword(SoColissimo::getConfigValue('socolissimo_password')); // An argument "Code réseau" is now required in addition to the Relay Point Code to identify a relay point outside France. // This argument is optional for relay points inside France. diff --git a/Loop/GetRelais.php b/Loop/GetRelais.php index ac0a759..a742b01 100755 --- a/Loop/GetRelais.php +++ b/Loop/GetRelais.php @@ -109,8 +109,8 @@ public function buildArray() ->setLang("FR") ->setOptionInter("1") ->setShippingDate(date("d/m/Y")) - ->setAccountNumber(ConfigQuery::read('socolissimo_login')) - ->setPassword(ConfigQuery::read('socolissimo_pwd')) + ->setAccountNumber(SoColissimo::getConfigValue('socolissimo_username')) + ->setPassword(SoColissimo::getConfigValue('socolissimo_password')) ; try { diff --git a/Loop/SoColissimoDeliveryMode.php b/Loop/SoColissimoDeliveryMode.php index 65b3148..c6f859c 100644 --- a/Loop/SoColissimoDeliveryMode.php +++ b/Loop/SoColissimoDeliveryMode.php @@ -3,6 +3,7 @@ namespace SoColissimo\Loop; use SoColissimo\Model\SocolissimoDeliveryModeQuery; +use SoColissimo\SoColissimo; use Thelia\Core\Template\Element\BaseLoop; use Thelia\Core\Template\Element\LoopResult; use Thelia\Core\Template\Element\LoopResultRow; @@ -39,13 +40,16 @@ public function parseResults(LoopResult $loopResult) { /** @var \SoColissimo\Model\SocolissimoDeliveryMode $mode */ foreach ($loopResult->getResultDataCollection() as $mode) { - $loopResultRow = new LoopResultRow($mode); - $loopResultRow->set("ID", $mode->getId()) - ->set("TITLE", $mode->getTitle()) - ->set("CODE", $mode->getCode()) - ->set("FREESHIPPING_ACTIVE", $mode->getFreeshippingActive()) - ->set("FREESHIPPING_FROM", $mode->getFreeshippingFrom()); - $loopResult->addRow($loopResultRow); + if (SoColissimo::getConfigValue('socolissimo_dom_delivery_authorized') || $mode->getId() !== 1) { + $loopResultRow = new LoopResultRow($mode); + $loopResultRow + ->set("ID", $mode->getId()) + ->set("TITLE", $mode->getTitle()) + ->set("CODE", $mode->getCode()) + ->set("FREESHIPPING_ACTIVE", $mode->getFreeshippingActive()) + ->set("FREESHIPPING_FROM", $mode->getFreeshippingFrom()); + $loopResult->addRow($loopResultRow); + } } return $loopResult; } diff --git a/Model/AddressSocolissimo.php b/Model/AddressSocolissimo.php old mode 100755 new mode 100644 diff --git a/Model/AddressSocolissimoQuery.php b/Model/AddressSocolissimoQuery.php old mode 100755 new mode 100644 index 8a6ac27..ea189f4 --- a/Model/AddressSocolissimoQuery.php +++ b/Model/AddressSocolissimoQuery.php @@ -4,6 +4,7 @@ use SoColissimo\Model\Base\AddressSocolissimoQuery as BaseAddressSocolissimoQuery; + /** * Skeleton subclass for performing query and update operations on the 'address_socolissimo' table. * diff --git a/Model/Base/AddressSocolissimo.php b/Model/Base/AddressSocolissimo.php old mode 100755 new mode 100644 diff --git a/Model/Base/AddressSocolissimoQuery.php b/Model/Base/AddressSocolissimoQuery.php old mode 100755 new mode 100644 diff --git a/Model/Base/OrderAddressSocolissimo.php b/Model/Base/OrderAddressSocolissimo.php old mode 100755 new mode 100644 diff --git a/Model/Base/OrderAddressSocolissimoQuery.php b/Model/Base/OrderAddressSocolissimoQuery.php old mode 100755 new mode 100644 diff --git a/Model/Base/SocolissimoAreaFreeshipping.php b/Model/Base/SocolissimoAreaFreeshipping.php deleted file mode 100644 index 0427b73..0000000 --- a/Model/Base/SocolissimoAreaFreeshipping.php +++ /dev/null @@ -1,1407 +0,0 @@ -cart_amount = '0.000000'; - } - - /** - * Initializes internal state of SoColissimo\Model\Base\SocolissimoAreaFreeshipping object. - * @see applyDefaults() - */ - public function __construct() - { - $this->applyDefaultValues(); - } - - /** - * Returns whether the object has been modified. - * - * @return boolean True if the object has been modified. - */ - public function isModified() - { - return !!$this->modifiedColumns; - } - - /** - * Has specified column been modified? - * - * @param string $col column fully qualified name (TableMap::TYPE_COLNAME), e.g. Book::AUTHOR_ID - * @return boolean True if $col has been modified. - */ - public function isColumnModified($col) - { - return $this->modifiedColumns && isset($this->modifiedColumns[$col]); - } - - /** - * Get the columns that have been modified in this object. - * @return array A unique list of the modified column names for this object. - */ - public function getModifiedColumns() - { - return $this->modifiedColumns ? array_keys($this->modifiedColumns) : []; - } - - /** - * Returns whether the object has ever been saved. This will - * be false, if the object was retrieved from storage or was created - * and then saved. - * - * @return boolean true, if the object has never been persisted. - */ - public function isNew() - { - return $this->new; - } - - /** - * Setter for the isNew attribute. This method will be called - * by Propel-generated children and objects. - * - * @param boolean $b the state of the object. - */ - public function setNew($b) - { - $this->new = (Boolean) $b; - } - - /** - * Whether this object has been deleted. - * @return boolean The deleted state of this object. - */ - public function isDeleted() - { - return $this->deleted; - } - - /** - * Specify whether this object has been deleted. - * @param boolean $b The deleted state of this object. - * @return void - */ - public function setDeleted($b) - { - $this->deleted = (Boolean) $b; - } - - /** - * Sets the modified state for the object to be false. - * @param string $col If supplied, only the specified column is reset. - * @return void - */ - public function resetModified($col = null) - { - if (null !== $col) { - if (isset($this->modifiedColumns[$col])) { - unset($this->modifiedColumns[$col]); - } - } else { - $this->modifiedColumns = array(); - } - } - - /** - * Compares this with another SocolissimoAreaFreeshipping instance. If - * obj is an instance of SocolissimoAreaFreeshipping, delegates to - * equals(SocolissimoAreaFreeshipping). Otherwise, returns false. - * - * @param mixed $obj The object to compare to. - * @return boolean Whether equal to the object specified. - */ - public function equals($obj) - { - $thisclazz = get_class($this); - if (!is_object($obj) || !($obj instanceof $thisclazz)) { - return false; - } - - if ($this === $obj) { - return true; - } - - if (null === $this->getPrimaryKey() - || null === $obj->getPrimaryKey()) { - return false; - } - - return $this->getPrimaryKey() === $obj->getPrimaryKey(); - } - - /** - * If the primary key is not null, return the hashcode of the - * primary key. Otherwise, return the hash code of the object. - * - * @return int Hashcode - */ - public function hashCode() - { - if (null !== $this->getPrimaryKey()) { - return crc32(serialize($this->getPrimaryKey())); - } - - return crc32(serialize(clone $this)); - } - - /** - * Get the associative array of the virtual columns in this object - * - * @return array - */ - public function getVirtualColumns() - { - return $this->virtualColumns; - } - - /** - * Checks the existence of a virtual column in this object - * - * @param string $name The virtual column name - * @return boolean - */ - public function hasVirtualColumn($name) - { - return array_key_exists($name, $this->virtualColumns); - } - - /** - * Get the value of a virtual column in this object - * - * @param string $name The virtual column name - * @return mixed - * - * @throws PropelException - */ - public function getVirtualColumn($name) - { - if (!$this->hasVirtualColumn($name)) { - throw new PropelException(sprintf('Cannot get value of inexistent virtual column %s.', $name)); - } - - return $this->virtualColumns[$name]; - } - - /** - * Set the value of a virtual column in this object - * - * @param string $name The virtual column name - * @param mixed $value The value to give to the virtual column - * - * @return SocolissimoAreaFreeshipping The current object, for fluid interface - */ - public function setVirtualColumn($name, $value) - { - $this->virtualColumns[$name] = $value; - - return $this; - } - - /** - * Logs a message using Propel::log(). - * - * @param string $msg - * @param int $priority One of the Propel::LOG_* logging levels - * @return boolean - */ - protected function log($msg, $priority = Propel::LOG_INFO) - { - return Propel::log(get_class($this) . ': ' . $msg, $priority); - } - - /** - * Populate the current object from a string, using a given parser format - * - * $book = new Book(); - * $book->importFrom('JSON', '{"Id":9012,"Title":"Don Juan","ISBN":"0140422161","Price":12.99,"PublisherId":1234,"AuthorId":5678}'); - * - * - * @param mixed $parser A AbstractParser instance, - * or a format name ('XML', 'YAML', 'JSON', 'CSV') - * @param string $data The source data to import from - * - * @return SocolissimoAreaFreeshipping The current object, for fluid interface - */ - public function importFrom($parser, $data) - { - if (!$parser instanceof AbstractParser) { - $parser = AbstractParser::getParser($parser); - } - - $this->fromArray($parser->toArray($data), TableMap::TYPE_PHPNAME); - - return $this; - } - - /** - * Export the current object properties to a string, using a given parser format - * - * $book = BookQuery::create()->findPk(9012); - * echo $book->exportTo('JSON'); - * => {"Id":9012,"Title":"Don Juan","ISBN":"0140422161","Price":12.99,"PublisherId":1234,"AuthorId":5678}'); - * - * - * @param mixed $parser A AbstractParser instance, or a format name ('XML', 'YAML', 'JSON', 'CSV') - * @param boolean $includeLazyLoadColumns (optional) Whether to include lazy load(ed) columns. Defaults to TRUE. - * @return string The exported data - */ - public function exportTo($parser, $includeLazyLoadColumns = true) - { - if (!$parser instanceof AbstractParser) { - $parser = AbstractParser::getParser($parser); - } - - return $parser->fromArray($this->toArray(TableMap::TYPE_PHPNAME, $includeLazyLoadColumns, array(), true)); - } - - /** - * Clean up internal collections prior to serializing - * Avoids recursive loops that turn into segmentation faults when serializing - */ - public function __sleep() - { - $this->clearAllReferences(); - - return array_keys(get_object_vars($this)); - } - - /** - * Get the [id] column value. - * - * @return int - */ - public function getId() - { - - return $this->id; - } - - /** - * Get the [area_id] column value. - * - * @return int - */ - public function getAreaId() - { - - return $this->area_id; - } - - /** - * Get the [delivery_mode_id] column value. - * - * @return int - */ - public function getDeliveryModeId() - { - - return $this->delivery_mode_id; - } - - /** - * Get the [cart_amount] column value. - * - * @return string - */ - public function getCartAmount() - { - - return $this->cart_amount; - } - - /** - * Set the value of [id] column. - * - * @param int $v new value - * @return \SoColissimo\Model\SocolissimoAreaFreeshipping The current object (for fluent API support) - */ - public function setId($v) - { - if ($v !== null) { - $v = (int) $v; - } - - if ($this->id !== $v) { - $this->id = $v; - $this->modifiedColumns[SocolissimoAreaFreeshippingTableMap::ID] = true; - } - - - return $this; - } // setId() - - /** - * Set the value of [area_id] column. - * - * @param int $v new value - * @return \SoColissimo\Model\SocolissimoAreaFreeshipping The current object (for fluent API support) - */ - public function setAreaId($v) - { - if ($v !== null) { - $v = (int) $v; - } - - if ($this->area_id !== $v) { - $this->area_id = $v; - $this->modifiedColumns[SocolissimoAreaFreeshippingTableMap::AREA_ID] = true; - } - - if ($this->aArea !== null && $this->aArea->getId() !== $v) { - $this->aArea = null; - } - - - return $this; - } // setAreaId() - - /** - * Set the value of [delivery_mode_id] column. - * - * @param int $v new value - * @return \SoColissimo\Model\SocolissimoAreaFreeshipping The current object (for fluent API support) - */ - public function setDeliveryModeId($v) - { - if ($v !== null) { - $v = (int) $v; - } - - if ($this->delivery_mode_id !== $v) { - $this->delivery_mode_id = $v; - $this->modifiedColumns[SocolissimoAreaFreeshippingTableMap::DELIVERY_MODE_ID] = true; - } - - if ($this->aSocolissimoDeliveryMode !== null && $this->aSocolissimoDeliveryMode->getId() !== $v) { - $this->aSocolissimoDeliveryMode = null; - } - - - return $this; - } // setDeliveryModeId() - - /** - * Set the value of [cart_amount] column. - * - * @param string $v new value - * @return \SoColissimo\Model\SocolissimoAreaFreeshipping The current object (for fluent API support) - */ - public function setCartAmount($v) - { - if ($v !== null) { - $v = (string) $v; - } - - if ($this->cart_amount !== $v) { - $this->cart_amount = $v; - $this->modifiedColumns[SocolissimoAreaFreeshippingTableMap::CART_AMOUNT] = true; - } - - - return $this; - } // setCartAmount() - - /** - * Indicates whether the columns in this object are only set to default values. - * - * This method can be used in conjunction with isModified() to indicate whether an object is both - * modified _and_ has some values set which are non-default. - * - * @return boolean Whether the columns in this object are only been set with default values. - */ - public function hasOnlyDefaultValues() - { - if ($this->cart_amount !== '0.000000') { - return false; - } - - // otherwise, everything was equal, so return TRUE - return true; - } // hasOnlyDefaultValues() - - /** - * Hydrates (populates) the object variables with values from the database resultset. - * - * An offset (0-based "start column") is specified so that objects can be hydrated - * with a subset of the columns in the resultset rows. This is needed, for example, - * for results of JOIN queries where the resultset row includes columns from two or - * more tables. - * - * @param array $row The row returned by DataFetcher->fetch(). - * @param int $startcol 0-based offset column which indicates which restultset column to start with. - * @param boolean $rehydrate Whether this object is being re-hydrated from the database. - * @param string $indexType The index type of $row. Mostly DataFetcher->getIndexType(). - One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * - * @return int next starting column - * @throws PropelException - Any caught Exception will be rewrapped as a PropelException. - */ - public function hydrate($row, $startcol = 0, $rehydrate = false, $indexType = TableMap::TYPE_NUM) - { - try { - - - $col = $row[TableMap::TYPE_NUM == $indexType ? 0 + $startcol : SocolissimoAreaFreeshippingTableMap::translateFieldName('Id', TableMap::TYPE_PHPNAME, $indexType)]; - $this->id = (null !== $col) ? (int) $col : null; - - $col = $row[TableMap::TYPE_NUM == $indexType ? 1 + $startcol : SocolissimoAreaFreeshippingTableMap::translateFieldName('AreaId', TableMap::TYPE_PHPNAME, $indexType)]; - $this->area_id = (null !== $col) ? (int) $col : null; - - $col = $row[TableMap::TYPE_NUM == $indexType ? 2 + $startcol : SocolissimoAreaFreeshippingTableMap::translateFieldName('DeliveryModeId', TableMap::TYPE_PHPNAME, $indexType)]; - $this->delivery_mode_id = (null !== $col) ? (int) $col : null; - - $col = $row[TableMap::TYPE_NUM == $indexType ? 3 + $startcol : SocolissimoAreaFreeshippingTableMap::translateFieldName('CartAmount', TableMap::TYPE_PHPNAME, $indexType)]; - $this->cart_amount = (null !== $col) ? (string) $col : null; - $this->resetModified(); - - $this->setNew(false); - - if ($rehydrate) { - $this->ensureConsistency(); - } - - return $startcol + 4; // 4 = SocolissimoAreaFreeshippingTableMap::NUM_HYDRATE_COLUMNS. - - } catch (Exception $e) { - throw new PropelException("Error populating \SoColissimo\Model\SocolissimoAreaFreeshipping object", 0, $e); - } - } - - /** - * Checks and repairs the internal consistency of the object. - * - * This method is executed after an already-instantiated object is re-hydrated - * from the database. It exists to check any foreign keys to make sure that - * the objects related to the current object are correct based on foreign key. - * - * You can override this method in the stub class, but you should always invoke - * the base method from the overridden method (i.e. parent::ensureConsistency()), - * in case your model changes. - * - * @throws PropelException - */ - public function ensureConsistency() - { - if ($this->aArea !== null && $this->area_id !== $this->aArea->getId()) { - $this->aArea = null; - } - if ($this->aSocolissimoDeliveryMode !== null && $this->delivery_mode_id !== $this->aSocolissimoDeliveryMode->getId()) { - $this->aSocolissimoDeliveryMode = null; - } - } // ensureConsistency - - /** - * Reloads this object from datastore based on primary key and (optionally) resets all associated objects. - * - * This will only work if the object has been saved and has a valid primary key set. - * - * @param boolean $deep (optional) Whether to also de-associated any related objects. - * @param ConnectionInterface $con (optional) The ConnectionInterface connection to use. - * @return void - * @throws PropelException - if this object is deleted, unsaved or doesn't have pk match in db - */ - public function reload($deep = false, ConnectionInterface $con = null) - { - if ($this->isDeleted()) { - throw new PropelException("Cannot reload a deleted object."); - } - - if ($this->isNew()) { - throw new PropelException("Cannot reload an unsaved object."); - } - - if ($con === null) { - $con = Propel::getServiceContainer()->getReadConnection(SocolissimoAreaFreeshippingTableMap::DATABASE_NAME); - } - - // We don't need to alter the object instance pool; we're just modifying this instance - // already in the pool. - - $dataFetcher = ChildSocolissimoAreaFreeshippingQuery::create(null, $this->buildPkeyCriteria())->setFormatter(ModelCriteria::FORMAT_STATEMENT)->find($con); - $row = $dataFetcher->fetch(); - $dataFetcher->close(); - if (!$row) { - throw new PropelException('Cannot find matching row in the database to reload object values.'); - } - $this->hydrate($row, 0, true, $dataFetcher->getIndexType()); // rehydrate - - if ($deep) { // also de-associate any related objects? - - $this->aArea = null; - $this->aSocolissimoDeliveryMode = null; - } // if (deep) - } - - /** - * Removes this object from datastore and sets delete attribute. - * - * @param ConnectionInterface $con - * @return void - * @throws PropelException - * @see SocolissimoAreaFreeshipping::setDeleted() - * @see SocolissimoAreaFreeshipping::isDeleted() - */ - public function delete(ConnectionInterface $con = null) - { - if ($this->isDeleted()) { - throw new PropelException("This object has already been deleted."); - } - - if ($con === null) { - $con = Propel::getServiceContainer()->getWriteConnection(SocolissimoAreaFreeshippingTableMap::DATABASE_NAME); - } - - $con->beginTransaction(); - try { - $deleteQuery = ChildSocolissimoAreaFreeshippingQuery::create() - ->filterByPrimaryKey($this->getPrimaryKey()); - $ret = $this->preDelete($con); - if ($ret) { - $deleteQuery->delete($con); - $this->postDelete($con); - $con->commit(); - $this->setDeleted(true); - } else { - $con->commit(); - } - } catch (Exception $e) { - $con->rollBack(); - throw $e; - } - } - - /** - * Persists this object to the database. - * - * If the object is new, it inserts it; otherwise an update is performed. - * All modified related objects will also be persisted in the doSave() - * method. This method wraps all precipitate database operations in a - * single transaction. - * - * @param ConnectionInterface $con - * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. - * @throws PropelException - * @see doSave() - */ - public function save(ConnectionInterface $con = null) - { - if ($this->isDeleted()) { - throw new PropelException("You cannot save an object that has been deleted."); - } - - if ($con === null) { - $con = Propel::getServiceContainer()->getWriteConnection(SocolissimoAreaFreeshippingTableMap::DATABASE_NAME); - } - - $con->beginTransaction(); - $isInsert = $this->isNew(); - try { - $ret = $this->preSave($con); - if ($isInsert) { - $ret = $ret && $this->preInsert($con); - } else { - $ret = $ret && $this->preUpdate($con); - } - if ($ret) { - $affectedRows = $this->doSave($con); - if ($isInsert) { - $this->postInsert($con); - } else { - $this->postUpdate($con); - } - $this->postSave($con); - SocolissimoAreaFreeshippingTableMap::addInstanceToPool($this); - } else { - $affectedRows = 0; - } - $con->commit(); - - return $affectedRows; - } catch (Exception $e) { - $con->rollBack(); - throw $e; - } - } - - /** - * Performs the work of inserting or updating the row in the database. - * - * If the object is new, it inserts it; otherwise an update is performed. - * All related objects are also updated in this method. - * - * @param ConnectionInterface $con - * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. - * @throws PropelException - * @see save() - */ - protected function doSave(ConnectionInterface $con) - { - $affectedRows = 0; // initialize var to track total num of affected rows - if (!$this->alreadyInSave) { - $this->alreadyInSave = true; - - // We call the save method on the following object(s) if they - // were passed to this object by their corresponding set - // method. This object relates to these object(s) by a - // foreign key reference. - - if ($this->aArea !== null) { - if ($this->aArea->isModified() || $this->aArea->isNew()) { - $affectedRows += $this->aArea->save($con); - } - $this->setArea($this->aArea); - } - - if ($this->aSocolissimoDeliveryMode !== null) { - if ($this->aSocolissimoDeliveryMode->isModified() || $this->aSocolissimoDeliveryMode->isNew()) { - $affectedRows += $this->aSocolissimoDeliveryMode->save($con); - } - $this->setSocolissimoDeliveryMode($this->aSocolissimoDeliveryMode); - } - - if ($this->isNew() || $this->isModified()) { - // persist changes - if ($this->isNew()) { - $this->doInsert($con); - } else { - $this->doUpdate($con); - } - $affectedRows += 1; - $this->resetModified(); - } - - $this->alreadyInSave = false; - - } - - return $affectedRows; - } // doSave() - - /** - * Insert the row in the database. - * - * @param ConnectionInterface $con - * - * @throws PropelException - * @see doSave() - */ - protected function doInsert(ConnectionInterface $con) - { - $modifiedColumns = array(); - $index = 0; - - $this->modifiedColumns[SocolissimoAreaFreeshippingTableMap::ID] = true; - if (null !== $this->id) { - throw new PropelException('Cannot insert a value for auto-increment primary key (' . SocolissimoAreaFreeshippingTableMap::ID . ')'); - } - - // check the columns in natural order for more readable SQL queries - if ($this->isColumnModified(SocolissimoAreaFreeshippingTableMap::ID)) { - $modifiedColumns[':p' . $index++] = 'ID'; - } - if ($this->isColumnModified(SocolissimoAreaFreeshippingTableMap::AREA_ID)) { - $modifiedColumns[':p' . $index++] = 'AREA_ID'; - } - if ($this->isColumnModified(SocolissimoAreaFreeshippingTableMap::DELIVERY_MODE_ID)) { - $modifiedColumns[':p' . $index++] = 'DELIVERY_MODE_ID'; - } - if ($this->isColumnModified(SocolissimoAreaFreeshippingTableMap::CART_AMOUNT)) { - $modifiedColumns[':p' . $index++] = 'CART_AMOUNT'; - } - - $sql = sprintf( - 'INSERT INTO socolissimo_area_freeshipping (%s) VALUES (%s)', - implode(', ', $modifiedColumns), - implode(', ', array_keys($modifiedColumns)) - ); - - try { - $stmt = $con->prepare($sql); - foreach ($modifiedColumns as $identifier => $columnName) { - switch ($columnName) { - case 'ID': - $stmt->bindValue($identifier, $this->id, PDO::PARAM_INT); - break; - case 'AREA_ID': - $stmt->bindValue($identifier, $this->area_id, PDO::PARAM_INT); - break; - case 'DELIVERY_MODE_ID': - $stmt->bindValue($identifier, $this->delivery_mode_id, PDO::PARAM_INT); - break; - case 'CART_AMOUNT': - $stmt->bindValue($identifier, $this->cart_amount, PDO::PARAM_STR); - break; - } - } - $stmt->execute(); - } catch (Exception $e) { - Propel::log($e->getMessage(), Propel::LOG_ERR); - throw new PropelException(sprintf('Unable to execute INSERT statement [%s]', $sql), 0, $e); - } - - try { - $pk = $con->lastInsertId(); - } catch (Exception $e) { - throw new PropelException('Unable to get autoincrement id.', 0, $e); - } - $this->setId($pk); - - $this->setNew(false); - } - - /** - * Update the row in the database. - * - * @param ConnectionInterface $con - * - * @return Integer Number of updated rows - * @see doSave() - */ - protected function doUpdate(ConnectionInterface $con) - { - $selectCriteria = $this->buildPkeyCriteria(); - $valuesCriteria = $this->buildCriteria(); - - return $selectCriteria->doUpdate($valuesCriteria, $con); - } - - /** - * Retrieves a field from the object by name passed in as a string. - * - * @param string $name name - * @param string $type The type of fieldname the $name is of: - * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. - * @return mixed Value of field. - */ - public function getByName($name, $type = TableMap::TYPE_PHPNAME) - { - $pos = SocolissimoAreaFreeshippingTableMap::translateFieldName($name, $type, TableMap::TYPE_NUM); - $field = $this->getByPosition($pos); - - return $field; - } - - /** - * Retrieves a field from the object by Position as specified in the xml schema. - * Zero-based. - * - * @param int $pos position in xml schema - * @return mixed Value of field at $pos - */ - public function getByPosition($pos) - { - switch ($pos) { - case 0: - return $this->getId(); - break; - case 1: - return $this->getAreaId(); - break; - case 2: - return $this->getDeliveryModeId(); - break; - case 3: - return $this->getCartAmount(); - break; - default: - return null; - break; - } // switch() - } - - /** - * Exports the object as an array. - * - * You can specify the key type of the array by passing one of the class - * type constants. - * - * @param string $keyType (optional) One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME, - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. - * @param boolean $includeLazyLoadColumns (optional) Whether to include lazy loaded columns. Defaults to TRUE. - * @param array $alreadyDumpedObjects List of objects to skip to avoid recursion - * @param boolean $includeForeignObjects (optional) Whether to include hydrated related objects. Default to FALSE. - * - * @return array an associative array containing the field names (as keys) and field values - */ - public function toArray($keyType = TableMap::TYPE_PHPNAME, $includeLazyLoadColumns = true, $alreadyDumpedObjects = array(), $includeForeignObjects = false) - { - if (isset($alreadyDumpedObjects['SocolissimoAreaFreeshipping'][$this->getPrimaryKey()])) { - return '*RECURSION*'; - } - $alreadyDumpedObjects['SocolissimoAreaFreeshipping'][$this->getPrimaryKey()] = true; - $keys = SocolissimoAreaFreeshippingTableMap::getFieldNames($keyType); - $result = array( - $keys[0] => $this->getId(), - $keys[1] => $this->getAreaId(), - $keys[2] => $this->getDeliveryModeId(), - $keys[3] => $this->getCartAmount(), - ); - $virtualColumns = $this->virtualColumns; - foreach ($virtualColumns as $key => $virtualColumn) { - $result[$key] = $virtualColumn; - } - - if ($includeForeignObjects) { - if (null !== $this->aArea) { - $result['Area'] = $this->aArea->toArray($keyType, $includeLazyLoadColumns, $alreadyDumpedObjects, true); - } - if (null !== $this->aSocolissimoDeliveryMode) { - $result['SocolissimoDeliveryMode'] = $this->aSocolissimoDeliveryMode->toArray($keyType, $includeLazyLoadColumns, $alreadyDumpedObjects, true); - } - } - - return $result; - } - - /** - * Sets a field from the object by name passed in as a string. - * - * @param string $name - * @param mixed $value field value - * @param string $type The type of fieldname the $name is of: - * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. - * @return void - */ - public function setByName($name, $value, $type = TableMap::TYPE_PHPNAME) - { - $pos = SocolissimoAreaFreeshippingTableMap::translateFieldName($name, $type, TableMap::TYPE_NUM); - - return $this->setByPosition($pos, $value); - } - - /** - * Sets a field from the object by Position as specified in the xml schema. - * Zero-based. - * - * @param int $pos position in xml schema - * @param mixed $value field value - * @return void - */ - public function setByPosition($pos, $value) - { - switch ($pos) { - case 0: - $this->setId($value); - break; - case 1: - $this->setAreaId($value); - break; - case 2: - $this->setDeliveryModeId($value); - break; - case 3: - $this->setCartAmount($value); - break; - } // switch() - } - - /** - * Populates the object using an array. - * - * This is particularly useful when populating an object from one of the - * request arrays (e.g. $_POST). This method goes through the column - * names, checking to see whether a matching key exists in populated - * array. If so the setByName() method is called for that column. - * - * You can specify the key type of the array by additionally passing one - * of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME, - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * The default key type is the column's TableMap::TYPE_PHPNAME. - * - * @param array $arr An array to populate the object from. - * @param string $keyType The type of keys the array uses. - * @return void - */ - public function fromArray($arr, $keyType = TableMap::TYPE_PHPNAME) - { - $keys = SocolissimoAreaFreeshippingTableMap::getFieldNames($keyType); - - if (array_key_exists($keys[0], $arr)) $this->setId($arr[$keys[0]]); - if (array_key_exists($keys[1], $arr)) $this->setAreaId($arr[$keys[1]]); - if (array_key_exists($keys[2], $arr)) $this->setDeliveryModeId($arr[$keys[2]]); - if (array_key_exists($keys[3], $arr)) $this->setCartAmount($arr[$keys[3]]); - } - - /** - * Build a Criteria object containing the values of all modified columns in this object. - * - * @return Criteria The Criteria object containing all modified values. - */ - public function buildCriteria() - { - $criteria = new Criteria(SocolissimoAreaFreeshippingTableMap::DATABASE_NAME); - - if ($this->isColumnModified(SocolissimoAreaFreeshippingTableMap::ID)) $criteria->add(SocolissimoAreaFreeshippingTableMap::ID, $this->id); - if ($this->isColumnModified(SocolissimoAreaFreeshippingTableMap::AREA_ID)) $criteria->add(SocolissimoAreaFreeshippingTableMap::AREA_ID, $this->area_id); - if ($this->isColumnModified(SocolissimoAreaFreeshippingTableMap::DELIVERY_MODE_ID)) $criteria->add(SocolissimoAreaFreeshippingTableMap::DELIVERY_MODE_ID, $this->delivery_mode_id); - if ($this->isColumnModified(SocolissimoAreaFreeshippingTableMap::CART_AMOUNT)) $criteria->add(SocolissimoAreaFreeshippingTableMap::CART_AMOUNT, $this->cart_amount); - - return $criteria; - } - - /** - * Builds a Criteria object containing the primary key for this object. - * - * Unlike buildCriteria() this method includes the primary key values regardless - * of whether or not they have been modified. - * - * @return Criteria The Criteria object containing value(s) for primary key(s). - */ - public function buildPkeyCriteria() - { - $criteria = new Criteria(SocolissimoAreaFreeshippingTableMap::DATABASE_NAME); - $criteria->add(SocolissimoAreaFreeshippingTableMap::ID, $this->id); - - return $criteria; - } - - /** - * Returns the primary key for this object (row). - * @return int - */ - public function getPrimaryKey() - { - return $this->getId(); - } - - /** - * Generic method to set the primary key (id column). - * - * @param int $key Primary key. - * @return void - */ - public function setPrimaryKey($key) - { - $this->setId($key); - } - - /** - * Returns true if the primary key for this object is null. - * @return boolean - */ - public function isPrimaryKeyNull() - { - - return null === $this->getId(); - } - - /** - * Sets contents of passed object to values from current object. - * - * If desired, this method can also make copies of all associated (fkey referrers) - * objects. - * - * @param object $copyObj An object of \SoColissimo\Model\SocolissimoAreaFreeshipping (or compatible) type. - * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. - * @param boolean $makeNew Whether to reset autoincrement PKs and make the object new. - * @throws PropelException - */ - public function copyInto($copyObj, $deepCopy = false, $makeNew = true) - { - $copyObj->setAreaId($this->getAreaId()); - $copyObj->setDeliveryModeId($this->getDeliveryModeId()); - $copyObj->setCartAmount($this->getCartAmount()); - if ($makeNew) { - $copyObj->setNew(true); - $copyObj->setId(NULL); // this is a auto-increment column, so set to default value - } - } - - /** - * Makes a copy of this object that will be inserted as a new row in table when saved. - * It creates a new object filling in the simple attributes, but skipping any primary - * keys that are defined for the table. - * - * If desired, this method can also make copies of all associated (fkey referrers) - * objects. - * - * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. - * @return \SoColissimo\Model\SocolissimoAreaFreeshipping Clone of current object. - * @throws PropelException - */ - public function copy($deepCopy = false) - { - // we use get_class(), because this might be a subclass - $clazz = get_class($this); - $copyObj = new $clazz(); - $this->copyInto($copyObj, $deepCopy); - - return $copyObj; - } - - /** - * Declares an association between this object and a ChildArea object. - * - * @param ChildArea $v - * @return \SoColissimo\Model\SocolissimoAreaFreeshipping The current object (for fluent API support) - * @throws PropelException - */ - public function setArea(ChildArea $v = null) - { - if ($v === null) { - $this->setAreaId(NULL); - } else { - $this->setAreaId($v->getId()); - } - - $this->aArea = $v; - - // Add binding for other direction of this n:n relationship. - // If this object has already been added to the ChildArea object, it will not be re-added. - if ($v !== null) { - $v->addSocolissimoAreaFreeshipping($this); - } - - - return $this; - } - - - /** - * Get the associated ChildArea object - * - * @param ConnectionInterface $con Optional Connection object. - * @return ChildArea The associated ChildArea object. - * @throws PropelException - */ - public function getArea(ConnectionInterface $con = null) - { - if ($this->aArea === null && ($this->area_id !== null)) { - $this->aArea = AreaQuery::create()->findPk($this->area_id, $con); - /* The following can be used additionally to - guarantee the related object contains a reference - to this object. This level of coupling may, however, be - undesirable since it could result in an only partially populated collection - in the referenced object. - $this->aArea->addSocolissimoAreaFreeshippings($this); - */ - } - - return $this->aArea; - } - - /** - * Declares an association between this object and a ChildSocolissimoDeliveryMode object. - * - * @param ChildSocolissimoDeliveryMode $v - * @return \SoColissimo\Model\SocolissimoAreaFreeshipping The current object (for fluent API support) - * @throws PropelException - */ - public function setSocolissimoDeliveryMode(ChildSocolissimoDeliveryMode $v = null) - { - if ($v === null) { - $this->setDeliveryModeId(NULL); - } else { - $this->setDeliveryModeId($v->getId()); - } - - $this->aSocolissimoDeliveryMode = $v; - - // Add binding for other direction of this n:n relationship. - // If this object has already been added to the ChildSocolissimoDeliveryMode object, it will not be re-added. - if ($v !== null) { - $v->addSocolissimoAreaFreeshipping($this); - } - - - return $this; - } - - - /** - * Get the associated ChildSocolissimoDeliveryMode object - * - * @param ConnectionInterface $con Optional Connection object. - * @return ChildSocolissimoDeliveryMode The associated ChildSocolissimoDeliveryMode object. - * @throws PropelException - */ - public function getSocolissimoDeliveryMode(ConnectionInterface $con = null) - { - if ($this->aSocolissimoDeliveryMode === null && ($this->delivery_mode_id !== null)) { - $this->aSocolissimoDeliveryMode = ChildSocolissimoDeliveryModeQuery::create()->findPk($this->delivery_mode_id, $con); - /* The following can be used additionally to - guarantee the related object contains a reference - to this object. This level of coupling may, however, be - undesirable since it could result in an only partially populated collection - in the referenced object. - $this->aSocolissimoDeliveryMode->addSocolissimoAreaFreeshippings($this); - */ - } - - return $this->aSocolissimoDeliveryMode; - } - - /** - * Clears the current object and sets all attributes to their default values - */ - public function clear() - { - $this->id = null; - $this->area_id = null; - $this->delivery_mode_id = null; - $this->cart_amount = null; - $this->alreadyInSave = false; - $this->clearAllReferences(); - $this->applyDefaultValues(); - $this->resetModified(); - $this->setNew(true); - $this->setDeleted(false); - } - - /** - * Resets all references to other model objects or collections of model objects. - * - * This method is a user-space workaround for PHP's inability to garbage collect - * objects with circular references (even in PHP 5.3). This is currently necessary - * when using Propel in certain daemon or large-volume/high-memory operations. - * - * @param boolean $deep Whether to also clear the references on all referrer objects. - */ - public function clearAllReferences($deep = false) - { - if ($deep) { - } // if ($deep) - - $this->aArea = null; - $this->aSocolissimoDeliveryMode = null; - } - - /** - * Return the string representation of this object - * - * @return string - */ - public function __toString() - { - return (string) $this->exportTo(SocolissimoAreaFreeshippingTableMap::DEFAULT_STRING_FORMAT); - } - - /** - * Code to be run before persisting the object - * @param ConnectionInterface $con - * @return boolean - */ - public function preSave(ConnectionInterface $con = null) - { - return true; - } - - /** - * Code to be run after persisting the object - * @param ConnectionInterface $con - */ - public function postSave(ConnectionInterface $con = null) - { - - } - - /** - * Code to be run before inserting to database - * @param ConnectionInterface $con - * @return boolean - */ - public function preInsert(ConnectionInterface $con = null) - { - return true; - } - - /** - * Code to be run after inserting to database - * @param ConnectionInterface $con - */ - public function postInsert(ConnectionInterface $con = null) - { - - } - - /** - * Code to be run before updating the object in database - * @param ConnectionInterface $con - * @return boolean - */ - public function preUpdate(ConnectionInterface $con = null) - { - return true; - } - - /** - * Code to be run after updating the object in database - * @param ConnectionInterface $con - */ - public function postUpdate(ConnectionInterface $con = null) - { - - } - - /** - * Code to be run before deleting the object in database - * @param ConnectionInterface $con - * @return boolean - */ - public function preDelete(ConnectionInterface $con = null) - { - return true; - } - - /** - * Code to be run after deleting the object in database - * @param ConnectionInterface $con - */ - public function postDelete(ConnectionInterface $con = null) - { - - } - - - /** - * Derived method to catches calls to undefined methods. - * - * Provides magic import/export method support (fromXML()/toXML(), fromYAML()/toYAML(), etc.). - * Allows to define default __call() behavior if you overwrite __call() - * - * @param string $name - * @param mixed $params - * - * @return array|string - */ - public function __call($name, $params) - { - if (0 === strpos($name, 'get')) { - $virtualColumn = substr($name, 3); - if ($this->hasVirtualColumn($virtualColumn)) { - return $this->getVirtualColumn($virtualColumn); - } - - $virtualColumn = lcfirst($virtualColumn); - if ($this->hasVirtualColumn($virtualColumn)) { - return $this->getVirtualColumn($virtualColumn); - } - } - - if (0 === strpos($name, 'from')) { - $format = substr($name, 4); - - return $this->importFrom($format, reset($params)); - } - - if (0 === strpos($name, 'to')) { - $format = substr($name, 2); - $includeLazyLoadColumns = isset($params[0]) ? $params[0] : true; - - return $this->exportTo($format, $includeLazyLoadColumns); - } - - throw new BadMethodCallException(sprintf('Call to undefined method: %s.', $name)); - } - -} diff --git a/Model/Base/SocolissimoAreaFreeshippingDom.php b/Model/Base/SocolissimoAreaFreeshippingDom.php index b7aa5db..53da9d2 100644 --- a/Model/Base/SocolissimoAreaFreeshippingDom.php +++ b/Model/Base/SocolissimoAreaFreeshippingDom.php @@ -75,7 +75,7 @@ abstract class SocolissimoAreaFreeshippingDom implements ActiveRecordInterface /** * The value for the cart_amount field. - * Note: this column has a database default value of: '0.000000' + * Note: this column has a database default value of: '0.00' * @var string */ protected $cart_amount; @@ -106,7 +106,7 @@ abstract class SocolissimoAreaFreeshippingDom implements ActiveRecordInterface */ public function applyDefaultValues() { - $this->cart_amount = '0.000000'; + $this->cart_amount = '0.00'; } /** @@ -515,7 +515,7 @@ public function setCartAmount($v) */ public function hasOnlyDefaultValues() { - if ($this->cart_amount !== '0.000000') { + if ($this->cart_amount !== '0.00') { return false; } diff --git a/Model/Base/SocolissimoAreaFreeshippingPr.php b/Model/Base/SocolissimoAreaFreeshippingPr.php index cc53f87..a9de7a9 100644 --- a/Model/Base/SocolissimoAreaFreeshippingPr.php +++ b/Model/Base/SocolissimoAreaFreeshippingPr.php @@ -75,7 +75,7 @@ abstract class SocolissimoAreaFreeshippingPr implements ActiveRecordInterface /** * The value for the cart_amount field. - * Note: this column has a database default value of: '0.000000' + * Note: this column has a database default value of: '0.00' * @var string */ protected $cart_amount; @@ -106,7 +106,7 @@ abstract class SocolissimoAreaFreeshippingPr implements ActiveRecordInterface */ public function applyDefaultValues() { - $this->cart_amount = '0.000000'; + $this->cart_amount = '0.00'; } /** @@ -515,7 +515,7 @@ public function setCartAmount($v) */ public function hasOnlyDefaultValues() { - if ($this->cart_amount !== '0.000000') { + if ($this->cart_amount !== '0.00') { return false; } diff --git a/Model/Base/SocolissimoAreaFreeshippingQuery.php b/Model/Base/SocolissimoAreaFreeshippingQuery.php deleted file mode 100644 index 89e5ff6..0000000 --- a/Model/Base/SocolissimoAreaFreeshippingQuery.php +++ /dev/null @@ -1,645 +0,0 @@ -setModelAlias($modelAlias); - } - if ($criteria instanceof Criteria) { - $query->mergeWith($criteria); - } - - return $query; - } - - /** - * Find object by primary key. - * Propel uses the instance pool to skip the database if the object exists. - * Go fast if the query is untouched. - * - * - * $obj = $c->findPk(12, $con); - * - * - * @param mixed $key Primary key to use for the query - * @param ConnectionInterface $con an optional connection object - * - * @return ChildSocolissimoAreaFreeshipping|array|mixed the result, formatted by the current formatter - */ - public function findPk($key, $con = null) - { - if ($key === null) { - return null; - } - if ((null !== ($obj = SocolissimoAreaFreeshippingTableMap::getInstanceFromPool((string) $key))) && !$this->formatter) { - // the object is already in the instance pool - return $obj; - } - if ($con === null) { - $con = Propel::getServiceContainer()->getReadConnection(SocolissimoAreaFreeshippingTableMap::DATABASE_NAME); - } - $this->basePreSelect($con); - if ($this->formatter || $this->modelAlias || $this->with || $this->select - || $this->selectColumns || $this->asColumns || $this->selectModifiers - || $this->map || $this->having || $this->joins) { - return $this->findPkComplex($key, $con); - } else { - return $this->findPkSimple($key, $con); - } - } - - /** - * Find object by primary key using raw SQL to go fast. - * Bypass doSelect() and the object formatter by using generated code. - * - * @param mixed $key Primary key to use for the query - * @param ConnectionInterface $con A connection object - * - * @return ChildSocolissimoAreaFreeshipping A model object, or null if the key is not found - */ - protected function findPkSimple($key, $con) - { - $sql = 'SELECT ID, AREA_ID, DELIVERY_MODE_ID, CART_AMOUNT FROM socolissimo_area_freeshipping WHERE ID = :p0'; - try { - $stmt = $con->prepare($sql); - $stmt->bindValue(':p0', $key, PDO::PARAM_INT); - $stmt->execute(); - } catch (Exception $e) { - Propel::log($e->getMessage(), Propel::LOG_ERR); - throw new PropelException(sprintf('Unable to execute SELECT statement [%s]', $sql), 0, $e); - } - $obj = null; - if ($row = $stmt->fetch(\PDO::FETCH_NUM)) { - $obj = new ChildSocolissimoAreaFreeshipping(); - $obj->hydrate($row); - SocolissimoAreaFreeshippingTableMap::addInstanceToPool($obj, (string) $key); - } - $stmt->closeCursor(); - - return $obj; - } - - /** - * Find object by primary key. - * - * @param mixed $key Primary key to use for the query - * @param ConnectionInterface $con A connection object - * - * @return ChildSocolissimoAreaFreeshipping|array|mixed the result, formatted by the current formatter - */ - protected function findPkComplex($key, $con) - { - // As the query uses a PK condition, no limit(1) is necessary. - $criteria = $this->isKeepQuery() ? clone $this : $this; - $dataFetcher = $criteria - ->filterByPrimaryKey($key) - ->doSelect($con); - - return $criteria->getFormatter()->init($criteria)->formatOne($dataFetcher); - } - - /** - * Find objects by primary key - * - * $objs = $c->findPks(array(12, 56, 832), $con); - * - * @param array $keys Primary keys to use for the query - * @param ConnectionInterface $con an optional connection object - * - * @return ObjectCollection|array|mixed the list of results, formatted by the current formatter - */ - public function findPks($keys, $con = null) - { - if (null === $con) { - $con = Propel::getServiceContainer()->getReadConnection($this->getDbName()); - } - $this->basePreSelect($con); - $criteria = $this->isKeepQuery() ? clone $this : $this; - $dataFetcher = $criteria - ->filterByPrimaryKeys($keys) - ->doSelect($con); - - return $criteria->getFormatter()->init($criteria)->format($dataFetcher); - } - - /** - * Filter the query by primary key - * - * @param mixed $key Primary key to use for the query - * - * @return ChildSocolissimoAreaFreeshippingQuery The current query, for fluid interface - */ - public function filterByPrimaryKey($key) - { - - return $this->addUsingAlias(SocolissimoAreaFreeshippingTableMap::ID, $key, Criteria::EQUAL); - } - - /** - * Filter the query by a list of primary keys - * - * @param array $keys The list of primary key to use for the query - * - * @return ChildSocolissimoAreaFreeshippingQuery The current query, for fluid interface - */ - public function filterByPrimaryKeys($keys) - { - - return $this->addUsingAlias(SocolissimoAreaFreeshippingTableMap::ID, $keys, Criteria::IN); - } - - /** - * Filter the query on the id column - * - * Example usage: - * - * $query->filterById(1234); // WHERE id = 1234 - * $query->filterById(array(12, 34)); // WHERE id IN (12, 34) - * $query->filterById(array('min' => 12)); // WHERE id > 12 - * - * - * @param mixed $id The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL - * - * @return ChildSocolissimoAreaFreeshippingQuery The current query, for fluid interface - */ - public function filterById($id = null, $comparison = null) - { - if (is_array($id)) { - $useMinMax = false; - if (isset($id['min'])) { - $this->addUsingAlias(SocolissimoAreaFreeshippingTableMap::ID, $id['min'], Criteria::GREATER_EQUAL); - $useMinMax = true; - } - if (isset($id['max'])) { - $this->addUsingAlias(SocolissimoAreaFreeshippingTableMap::ID, $id['max'], Criteria::LESS_EQUAL); - $useMinMax = true; - } - if ($useMinMax) { - return $this; - } - if (null === $comparison) { - $comparison = Criteria::IN; - } - } - - return $this->addUsingAlias(SocolissimoAreaFreeshippingTableMap::ID, $id, $comparison); - } - - /** - * Filter the query on the area_id column - * - * Example usage: - * - * $query->filterByAreaId(1234); // WHERE area_id = 1234 - * $query->filterByAreaId(array(12, 34)); // WHERE area_id IN (12, 34) - * $query->filterByAreaId(array('min' => 12)); // WHERE area_id > 12 - * - * - * @see filterByArea() - * - * @param mixed $areaId The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL - * - * @return ChildSocolissimoAreaFreeshippingQuery The current query, for fluid interface - */ - public function filterByAreaId($areaId = null, $comparison = null) - { - if (is_array($areaId)) { - $useMinMax = false; - if (isset($areaId['min'])) { - $this->addUsingAlias(SocolissimoAreaFreeshippingTableMap::AREA_ID, $areaId['min'], Criteria::GREATER_EQUAL); - $useMinMax = true; - } - if (isset($areaId['max'])) { - $this->addUsingAlias(SocolissimoAreaFreeshippingTableMap::AREA_ID, $areaId['max'], Criteria::LESS_EQUAL); - $useMinMax = true; - } - if ($useMinMax) { - return $this; - } - if (null === $comparison) { - $comparison = Criteria::IN; - } - } - - return $this->addUsingAlias(SocolissimoAreaFreeshippingTableMap::AREA_ID, $areaId, $comparison); - } - - /** - * Filter the query on the delivery_mode_id column - * - * Example usage: - * - * $query->filterByDeliveryModeId(1234); // WHERE delivery_mode_id = 1234 - * $query->filterByDeliveryModeId(array(12, 34)); // WHERE delivery_mode_id IN (12, 34) - * $query->filterByDeliveryModeId(array('min' => 12)); // WHERE delivery_mode_id > 12 - * - * - * @see filterBySocolissimoDeliveryMode() - * - * @param mixed $deliveryModeId The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL - * - * @return ChildSocolissimoAreaFreeshippingQuery The current query, for fluid interface - */ - public function filterByDeliveryModeId($deliveryModeId = null, $comparison = null) - { - if (is_array($deliveryModeId)) { - $useMinMax = false; - if (isset($deliveryModeId['min'])) { - $this->addUsingAlias(SocolissimoAreaFreeshippingTableMap::DELIVERY_MODE_ID, $deliveryModeId['min'], Criteria::GREATER_EQUAL); - $useMinMax = true; - } - if (isset($deliveryModeId['max'])) { - $this->addUsingAlias(SocolissimoAreaFreeshippingTableMap::DELIVERY_MODE_ID, $deliveryModeId['max'], Criteria::LESS_EQUAL); - $useMinMax = true; - } - if ($useMinMax) { - return $this; - } - if (null === $comparison) { - $comparison = Criteria::IN; - } - } - - return $this->addUsingAlias(SocolissimoAreaFreeshippingTableMap::DELIVERY_MODE_ID, $deliveryModeId, $comparison); - } - - /** - * Filter the query on the cart_amount column - * - * Example usage: - * - * $query->filterByCartAmount(1234); // WHERE cart_amount = 1234 - * $query->filterByCartAmount(array(12, 34)); // WHERE cart_amount IN (12, 34) - * $query->filterByCartAmount(array('min' => 12)); // WHERE cart_amount > 12 - * - * - * @param mixed $cartAmount The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL - * - * @return ChildSocolissimoAreaFreeshippingQuery The current query, for fluid interface - */ - public function filterByCartAmount($cartAmount = null, $comparison = null) - { - if (is_array($cartAmount)) { - $useMinMax = false; - if (isset($cartAmount['min'])) { - $this->addUsingAlias(SocolissimoAreaFreeshippingTableMap::CART_AMOUNT, $cartAmount['min'], Criteria::GREATER_EQUAL); - $useMinMax = true; - } - if (isset($cartAmount['max'])) { - $this->addUsingAlias(SocolissimoAreaFreeshippingTableMap::CART_AMOUNT, $cartAmount['max'], Criteria::LESS_EQUAL); - $useMinMax = true; - } - if ($useMinMax) { - return $this; - } - if (null === $comparison) { - $comparison = Criteria::IN; - } - } - - return $this->addUsingAlias(SocolissimoAreaFreeshippingTableMap::CART_AMOUNT, $cartAmount, $comparison); - } - - /** - * Filter the query by a related \SoColissimo\Model\Thelia\Model\Area object - * - * @param \SoColissimo\Model\Thelia\Model\Area|ObjectCollection $area The related object(s) to use as filter - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL - * - * @return ChildSocolissimoAreaFreeshippingQuery The current query, for fluid interface - */ - public function filterByArea($area, $comparison = null) - { - if ($area instanceof \SoColissimo\Model\Thelia\Model\Area) { - return $this - ->addUsingAlias(SocolissimoAreaFreeshippingTableMap::AREA_ID, $area->getId(), $comparison); - } elseif ($area instanceof ObjectCollection) { - if (null === $comparison) { - $comparison = Criteria::IN; - } - - return $this - ->addUsingAlias(SocolissimoAreaFreeshippingTableMap::AREA_ID, $area->toKeyValue('PrimaryKey', 'Id'), $comparison); - } else { - throw new PropelException('filterByArea() only accepts arguments of type \SoColissimo\Model\Thelia\Model\Area or Collection'); - } - } - - /** - * Adds a JOIN clause to the query using the Area relation - * - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' - * - * @return ChildSocolissimoAreaFreeshippingQuery The current query, for fluid interface - */ - public function joinArea($relationAlias = null, $joinType = Criteria::INNER_JOIN) - { - $tableMap = $this->getTableMap(); - $relationMap = $tableMap->getRelation('Area'); - - // create a ModelJoin object for this join - $join = new ModelJoin(); - $join->setJoinType($joinType); - $join->setRelationMap($relationMap, $this->useAliasInSQL ? $this->getModelAlias() : null, $relationAlias); - if ($previousJoin = $this->getPreviousJoin()) { - $join->setPreviousJoin($previousJoin); - } - - // add the ModelJoin to the current object - if ($relationAlias) { - $this->addAlias($relationAlias, $relationMap->getRightTable()->getName()); - $this->addJoinObject($join, $relationAlias); - } else { - $this->addJoinObject($join, 'Area'); - } - - return $this; - } - - /** - * Use the Area relation Area object - * - * @see useQuery() - * - * @param string $relationAlias optional alias for the relation, - * to be used as main alias in the secondary query - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' - * - * @return \SoColissimo\Model\Thelia\Model\AreaQuery A secondary query class using the current class as primary query - */ - public function useAreaQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN) - { - return $this - ->joinArea($relationAlias, $joinType) - ->useQuery($relationAlias ? $relationAlias : 'Area', '\SoColissimo\Model\Thelia\Model\AreaQuery'); - } - - /** - * Filter the query by a related \SoColissimo\Model\SocolissimoDeliveryMode object - * - * @param \SoColissimo\Model\SocolissimoDeliveryMode|ObjectCollection $socolissimoDeliveryMode The related object(s) to use as filter - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL - * - * @return ChildSocolissimoAreaFreeshippingQuery The current query, for fluid interface - */ - public function filterBySocolissimoDeliveryMode($socolissimoDeliveryMode, $comparison = null) - { - if ($socolissimoDeliveryMode instanceof \SoColissimo\Model\SocolissimoDeliveryMode) { - return $this - ->addUsingAlias(SocolissimoAreaFreeshippingTableMap::DELIVERY_MODE_ID, $socolissimoDeliveryMode->getId(), $comparison); - } elseif ($socolissimoDeliveryMode instanceof ObjectCollection) { - if (null === $comparison) { - $comparison = Criteria::IN; - } - - return $this - ->addUsingAlias(SocolissimoAreaFreeshippingTableMap::DELIVERY_MODE_ID, $socolissimoDeliveryMode->toKeyValue('PrimaryKey', 'Id'), $comparison); - } else { - throw new PropelException('filterBySocolissimoDeliveryMode() only accepts arguments of type \SoColissimo\Model\SocolissimoDeliveryMode or Collection'); - } - } - - /** - * Adds a JOIN clause to the query using the SocolissimoDeliveryMode relation - * - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' - * - * @return ChildSocolissimoAreaFreeshippingQuery The current query, for fluid interface - */ - public function joinSocolissimoDeliveryMode($relationAlias = null, $joinType = Criteria::INNER_JOIN) - { - $tableMap = $this->getTableMap(); - $relationMap = $tableMap->getRelation('SocolissimoDeliveryMode'); - - // create a ModelJoin object for this join - $join = new ModelJoin(); - $join->setJoinType($joinType); - $join->setRelationMap($relationMap, $this->useAliasInSQL ? $this->getModelAlias() : null, $relationAlias); - if ($previousJoin = $this->getPreviousJoin()) { - $join->setPreviousJoin($previousJoin); - } - - // add the ModelJoin to the current object - if ($relationAlias) { - $this->addAlias($relationAlias, $relationMap->getRightTable()->getName()); - $this->addJoinObject($join, $relationAlias); - } else { - $this->addJoinObject($join, 'SocolissimoDeliveryMode'); - } - - return $this; - } - - /** - * Use the SocolissimoDeliveryMode relation SocolissimoDeliveryMode object - * - * @see useQuery() - * - * @param string $relationAlias optional alias for the relation, - * to be used as main alias in the secondary query - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' - * - * @return \SoColissimo\Model\SocolissimoDeliveryModeQuery A secondary query class using the current class as primary query - */ - public function useSocolissimoDeliveryModeQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN) - { - return $this - ->joinSocolissimoDeliveryMode($relationAlias, $joinType) - ->useQuery($relationAlias ? $relationAlias : 'SocolissimoDeliveryMode', '\SoColissimo\Model\SocolissimoDeliveryModeQuery'); - } - - /** - * Exclude object from result - * - * @param ChildSocolissimoAreaFreeshipping $socolissimoAreaFreeshipping Object to remove from the list of results - * - * @return ChildSocolissimoAreaFreeshippingQuery The current query, for fluid interface - */ - public function prune($socolissimoAreaFreeshipping = null) - { - if ($socolissimoAreaFreeshipping) { - $this->addUsingAlias(SocolissimoAreaFreeshippingTableMap::ID, $socolissimoAreaFreeshipping->getId(), Criteria::NOT_EQUAL); - } - - return $this; - } - - /** - * Deletes all rows from the socolissimo_area_freeshipping table. - * - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). - */ - public function doDeleteAll(ConnectionInterface $con = null) - { - if (null === $con) { - $con = Propel::getServiceContainer()->getWriteConnection(SocolissimoAreaFreeshippingTableMap::DATABASE_NAME); - } - $affectedRows = 0; // initialize var to track total num of affected rows - try { - // use transaction because $criteria could contain info - // for more than one table or we could emulating ON DELETE CASCADE, etc. - $con->beginTransaction(); - $affectedRows += parent::doDeleteAll($con); - // Because this db requires some delete cascade/set null emulation, we have to - // clear the cached instance *after* the emulation has happened (since - // instances get re-added by the select statement contained therein). - SocolissimoAreaFreeshippingTableMap::clearInstancePool(); - SocolissimoAreaFreeshippingTableMap::clearRelatedInstancePool(); - - $con->commit(); - } catch (PropelException $e) { - $con->rollBack(); - throw $e; - } - - return $affectedRows; - } - - /** - * Performs a DELETE on the database, given a ChildSocolissimoAreaFreeshipping or Criteria object OR a primary key value. - * - * @param mixed $values Criteria or ChildSocolissimoAreaFreeshipping object or primary key or array of primary keys - * which is used to create the DELETE statement - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows - * if supported by native driver or if emulated using Propel. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. - */ - public function delete(ConnectionInterface $con = null) - { - if (null === $con) { - $con = Propel::getServiceContainer()->getWriteConnection(SocolissimoAreaFreeshippingTableMap::DATABASE_NAME); - } - - $criteria = $this; - - // Set the correct dbName - $criteria->setDbName(SocolissimoAreaFreeshippingTableMap::DATABASE_NAME); - - $affectedRows = 0; // initialize var to track total num of affected rows - - try { - // use transaction because $criteria could contain info - // for more than one table or we could emulating ON DELETE CASCADE, etc. - $con->beginTransaction(); - - - SocolissimoAreaFreeshippingTableMap::removeInstanceFromPool($criteria); - - $affectedRows += ModelCriteria::delete($con); - SocolissimoAreaFreeshippingTableMap::clearRelatedInstancePool(); - $con->commit(); - - return $affectedRows; - } catch (PropelException $e) { - $con->rollBack(); - throw $e; - } - } - -} // SocolissimoAreaFreeshippingQuery diff --git a/Model/Base/SocolissimoFreeshipping.php b/Model/Base/SocolissimoFreeshipping.php deleted file mode 100755 index 0b1a464..0000000 --- a/Model/Base/SocolissimoFreeshipping.php +++ /dev/null @@ -1,1286 +0,0 @@ -modifiedColumns; - } - - /** - * Has specified column been modified? - * - * @param string $col column fully qualified name (TableMap::TYPE_COLNAME), e.g. Book::AUTHOR_ID - * @return boolean True if $col has been modified. - */ - public function isColumnModified($col) - { - return $this->modifiedColumns && isset($this->modifiedColumns[$col]); - } - - /** - * Get the columns that have been modified in this object. - * @return array A unique list of the modified column names for this object. - */ - public function getModifiedColumns() - { - return $this->modifiedColumns ? array_keys($this->modifiedColumns) : []; - } - - /** - * Returns whether the object has ever been saved. This will - * be false, if the object was retrieved from storage or was created - * and then saved. - * - * @return boolean true, if the object has never been persisted. - */ - public function isNew() - { - return $this->new; - } - - /** - * Setter for the isNew attribute. This method will be called - * by Propel-generated children and objects. - * - * @param boolean $b the state of the object. - */ - public function setNew($b) - { - $this->new = (Boolean) $b; - } - - /** - * Whether this object has been deleted. - * @return boolean The deleted state of this object. - */ - public function isDeleted() - { - return $this->deleted; - } - - /** - * Specify whether this object has been deleted. - * @param boolean $b The deleted state of this object. - * @return void - */ - public function setDeleted($b) - { - $this->deleted = (Boolean) $b; - } - - /** - * Sets the modified state for the object to be false. - * @param string $col If supplied, only the specified column is reset. - * @return void - */ - public function resetModified($col = null) - { - if (null !== $col) { - if (isset($this->modifiedColumns[$col])) { - unset($this->modifiedColumns[$col]); - } - } else { - $this->modifiedColumns = array(); - } - } - - /** - * Compares this with another SocolissimoFreeshipping instance. If - * obj is an instance of SocolissimoFreeshipping, delegates to - * equals(SocolissimoFreeshipping). Otherwise, returns false. - * - * @param mixed $obj The object to compare to. - * @return boolean Whether equal to the object specified. - */ - public function equals($obj) - { - $thisclazz = get_class($this); - if (!is_object($obj) || !($obj instanceof $thisclazz)) { - return false; - } - - if ($this === $obj) { - return true; - } - - if (null === $this->getPrimaryKey() - || null === $obj->getPrimaryKey()) { - return false; - } - - return $this->getPrimaryKey() === $obj->getPrimaryKey(); - } - - /** - * If the primary key is not null, return the hashcode of the - * primary key. Otherwise, return the hash code of the object. - * - * @return int Hashcode - */ - public function hashCode() - { - if (null !== $this->getPrimaryKey()) { - return crc32(serialize($this->getPrimaryKey())); - } - - return crc32(serialize(clone $this)); - } - - /** - * Get the associative array of the virtual columns in this object - * - * @return array - */ - public function getVirtualColumns() - { - return $this->virtualColumns; - } - - /** - * Checks the existence of a virtual column in this object - * - * @param string $name The virtual column name - * @return boolean - */ - public function hasVirtualColumn($name) - { - return array_key_exists($name, $this->virtualColumns); - } - - /** - * Get the value of a virtual column in this object - * - * @param string $name The virtual column name - * @return mixed - * - * @throws PropelException - */ - public function getVirtualColumn($name) - { - if (!$this->hasVirtualColumn($name)) { - throw new PropelException(sprintf('Cannot get value of inexistent virtual column %s.', $name)); - } - - return $this->virtualColumns[$name]; - } - - /** - * Set the value of a virtual column in this object - * - * @param string $name The virtual column name - * @param mixed $value The value to give to the virtual column - * - * @return SocolissimoFreeshipping The current object, for fluid interface - */ - public function setVirtualColumn($name, $value) - { - $this->virtualColumns[$name] = $value; - - return $this; - } - - /** - * Logs a message using Propel::log(). - * - * @param string $msg - * @param int $priority One of the Propel::LOG_* logging levels - * @return boolean - */ - protected function log($msg, $priority = Propel::LOG_INFO) - { - return Propel::log(get_class($this) . ': ' . $msg, $priority); - } - - /** - * Populate the current object from a string, using a given parser format - * - * $book = new Book(); - * $book->importFrom('JSON', '{"Id":9012,"Title":"Don Juan","ISBN":"0140422161","Price":12.99,"PublisherId":1234,"AuthorId":5678}'); - * - * - * @param mixed $parser A AbstractParser instance, - * or a format name ('XML', 'YAML', 'JSON', 'CSV') - * @param string $data The source data to import from - * - * @return SocolissimoFreeshipping The current object, for fluid interface - */ - public function importFrom($parser, $data) - { - if (!$parser instanceof AbstractParser) { - $parser = AbstractParser::getParser($parser); - } - - $this->fromArray($parser->toArray($data), TableMap::TYPE_PHPNAME); - - return $this; - } - - /** - * Export the current object properties to a string, using a given parser format - * - * $book = BookQuery::create()->findPk(9012); - * echo $book->exportTo('JSON'); - * => {"Id":9012,"Title":"Don Juan","ISBN":"0140422161","Price":12.99,"PublisherId":1234,"AuthorId":5678}'); - * - * - * @param mixed $parser A AbstractParser instance, or a format name ('XML', 'YAML', 'JSON', 'CSV') - * @param boolean $includeLazyLoadColumns (optional) Whether to include lazy load(ed) columns. Defaults to TRUE. - * @return string The exported data - */ - public function exportTo($parser, $includeLazyLoadColumns = true) - { - if (!$parser instanceof AbstractParser) { - $parser = AbstractParser::getParser($parser); - } - - return $parser->fromArray($this->toArray(TableMap::TYPE_PHPNAME, $includeLazyLoadColumns, array(), true)); - } - - /** - * Clean up internal collections prior to serializing - * Avoids recursive loops that turn into segmentation faults when serializing - */ - public function __sleep() - { - $this->clearAllReferences(); - - return array_keys(get_object_vars($this)); - } - - /** - * Get the [id] column value. - * - * @return int - */ - public function getId() - { - - return $this->id; - } - - /** - * Get the [active] column value. - * - * @return boolean - */ - public function getActive() - { - - return $this->active; - } - - /** - * Get the [optionally formatted] temporal [created_at] column value. - * - * - * @param string $format The date/time format string (either date()-style or strftime()-style). - * If format is NULL, then the raw \DateTime object will be returned. - * - * @return mixed Formatted date/time value as string or \DateTime object (if format is NULL), NULL if column is NULL, and 0 if column value is 0000-00-00 00:00:00 - * - * @throws PropelException - if unable to parse/validate the date/time value. - */ - public function getCreatedAt($format = NULL) - { - if ($format === null) { - return $this->created_at; - } else { - return $this->created_at instanceof \DateTime ? $this->created_at->format($format) : null; - } - } - - /** - * Get the [optionally formatted] temporal [updated_at] column value. - * - * - * @param string $format The date/time format string (either date()-style or strftime()-style). - * If format is NULL, then the raw \DateTime object will be returned. - * - * @return mixed Formatted date/time value as string or \DateTime object (if format is NULL), NULL if column is NULL, and 0 if column value is 0000-00-00 00:00:00 - * - * @throws PropelException - if unable to parse/validate the date/time value. - */ - public function getUpdatedAt($format = NULL) - { - if ($format === null) { - return $this->updated_at; - } else { - return $this->updated_at instanceof \DateTime ? $this->updated_at->format($format) : null; - } - } - - /** - * Set the value of [id] column. - * - * @param int $v new value - * @return \SoColissimo\Model\SocolissimoFreeshipping The current object (for fluent API support) - */ - public function setId($v) - { - if ($v !== null) { - $v = (int) $v; - } - - if ($this->id !== $v) { - $this->id = $v; - $this->modifiedColumns[SocolissimoFreeshippingTableMap::ID] = true; - } - - - return $this; - } // setId() - - /** - * Sets the value of the [active] 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 \SoColissimo\Model\SocolissimoFreeshipping The current object (for fluent API support) - */ - public function setActive($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->active !== $v) { - $this->active = $v; - $this->modifiedColumns[SocolissimoFreeshippingTableMap::ACTIVE] = true; - } - - - return $this; - } // setActive() - - /** - * Sets the value of [created_at] column to a normalized version of the date/time value specified. - * - * @param mixed $v string, integer (timestamp), or \DateTime value. - * Empty strings are treated as NULL. - * @return \SoColissimo\Model\SocolissimoFreeshipping The current object (for fluent API support) - */ - public function setCreatedAt($v) - { - $dt = PropelDateTime::newInstance($v, null, '\DateTime'); - if ($this->created_at !== null || $dt !== null) { - if ($dt !== $this->created_at) { - $this->created_at = $dt; - $this->modifiedColumns[SocolissimoFreeshippingTableMap::CREATED_AT] = true; - } - } // if either are not null - - - return $this; - } // setCreatedAt() - - /** - * Sets the value of [updated_at] column to a normalized version of the date/time value specified. - * - * @param mixed $v string, integer (timestamp), or \DateTime value. - * Empty strings are treated as NULL. - * @return \SoColissimo\Model\SocolissimoFreeshipping The current object (for fluent API support) - */ - public function setUpdatedAt($v) - { - $dt = PropelDateTime::newInstance($v, null, '\DateTime'); - if ($this->updated_at !== null || $dt !== null) { - if ($dt !== $this->updated_at) { - $this->updated_at = $dt; - $this->modifiedColumns[SocolissimoFreeshippingTableMap::UPDATED_AT] = true; - } - } // if either are not null - - - return $this; - } // setUpdatedAt() - - /** - * Indicates whether the columns in this object are only set to default values. - * - * This method can be used in conjunction with isModified() to indicate whether an object is both - * modified _and_ has some values set which are non-default. - * - * @return boolean Whether the columns in this object are only been set with default values. - */ - public function hasOnlyDefaultValues() - { - // otherwise, everything was equal, so return TRUE - return true; - } // hasOnlyDefaultValues() - - /** - * Hydrates (populates) the object variables with values from the database resultset. - * - * An offset (0-based "start column") is specified so that objects can be hydrated - * with a subset of the columns in the resultset rows. This is needed, for example, - * for results of JOIN queries where the resultset row includes columns from two or - * more tables. - * - * @param array $row The row returned by DataFetcher->fetch(). - * @param int $startcol 0-based offset column which indicates which restultset column to start with. - * @param boolean $rehydrate Whether this object is being re-hydrated from the database. - * @param string $indexType The index type of $row. Mostly DataFetcher->getIndexType(). - One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * - * @return int next starting column - * @throws PropelException - Any caught Exception will be rewrapped as a PropelException. - */ - public function hydrate($row, $startcol = 0, $rehydrate = false, $indexType = TableMap::TYPE_NUM) - { - try { - - - $col = $row[TableMap::TYPE_NUM == $indexType ? 0 + $startcol : SocolissimoFreeshippingTableMap::translateFieldName('Id', TableMap::TYPE_PHPNAME, $indexType)]; - $this->id = (null !== $col) ? (int) $col : null; - - $col = $row[TableMap::TYPE_NUM == $indexType ? 1 + $startcol : SocolissimoFreeshippingTableMap::translateFieldName('Active', TableMap::TYPE_PHPNAME, $indexType)]; - $this->active = (null !== $col) ? (boolean) $col : null; - - $col = $row[TableMap::TYPE_NUM == $indexType ? 2 + $startcol : SocolissimoFreeshippingTableMap::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 ? 3 + $startcol : SocolissimoFreeshippingTableMap::translateFieldName('UpdatedAt', TableMap::TYPE_PHPNAME, $indexType)]; - if ($col === '0000-00-00 00:00:00') { - $col = null; - } - $this->updated_at = (null !== $col) ? PropelDateTime::newInstance($col, null, '\DateTime') : null; - $this->resetModified(); - - $this->setNew(false); - - if ($rehydrate) { - $this->ensureConsistency(); - } - - return $startcol + 4; // 4 = SocolissimoFreeshippingTableMap::NUM_HYDRATE_COLUMNS. - - } catch (Exception $e) { - throw new PropelException("Error populating \SoColissimo\Model\SocolissimoFreeshipping object", 0, $e); - } - } - - /** - * Checks and repairs the internal consistency of the object. - * - * This method is executed after an already-instantiated object is re-hydrated - * from the database. It exists to check any foreign keys to make sure that - * the objects related to the current object are correct based on foreign key. - * - * You can override this method in the stub class, but you should always invoke - * the base method from the overridden method (i.e. parent::ensureConsistency()), - * in case your model changes. - * - * @throws PropelException - */ - public function ensureConsistency() - { - } // ensureConsistency - - /** - * Reloads this object from datastore based on primary key and (optionally) resets all associated objects. - * - * This will only work if the object has been saved and has a valid primary key set. - * - * @param boolean $deep (optional) Whether to also de-associated any related objects. - * @param ConnectionInterface $con (optional) The ConnectionInterface connection to use. - * @return void - * @throws PropelException - if this object is deleted, unsaved or doesn't have pk match in db - */ - public function reload($deep = false, ConnectionInterface $con = null) - { - if ($this->isDeleted()) { - throw new PropelException("Cannot reload a deleted object."); - } - - if ($this->isNew()) { - throw new PropelException("Cannot reload an unsaved object."); - } - - if ($con === null) { - $con = Propel::getServiceContainer()->getReadConnection(SocolissimoFreeshippingTableMap::DATABASE_NAME); - } - - // We don't need to alter the object instance pool; we're just modifying this instance - // already in the pool. - - $dataFetcher = ChildSocolissimoFreeshippingQuery::create(null, $this->buildPkeyCriteria())->setFormatter(ModelCriteria::FORMAT_STATEMENT)->find($con); - $row = $dataFetcher->fetch(); - $dataFetcher->close(); - if (!$row) { - throw new PropelException('Cannot find matching row in the database to reload object values.'); - } - $this->hydrate($row, 0, true, $dataFetcher->getIndexType()); // rehydrate - - if ($deep) { // also de-associate any related objects? - - } // if (deep) - } - - /** - * Removes this object from datastore and sets delete attribute. - * - * @param ConnectionInterface $con - * @return void - * @throws PropelException - * @see SocolissimoFreeshipping::setDeleted() - * @see SocolissimoFreeshipping::isDeleted() - */ - public function delete(ConnectionInterface $con = null) - { - if ($this->isDeleted()) { - throw new PropelException("This object has already been deleted."); - } - - if ($con === null) { - $con = Propel::getServiceContainer()->getWriteConnection(SocolissimoFreeshippingTableMap::DATABASE_NAME); - } - - $con->beginTransaction(); - try { - $deleteQuery = ChildSocolissimoFreeshippingQuery::create() - ->filterByPrimaryKey($this->getPrimaryKey()); - $ret = $this->preDelete($con); - if ($ret) { - $deleteQuery->delete($con); - $this->postDelete($con); - $con->commit(); - $this->setDeleted(true); - } else { - $con->commit(); - } - } catch (Exception $e) { - $con->rollBack(); - throw $e; - } - } - - /** - * Persists this object to the database. - * - * If the object is new, it inserts it; otherwise an update is performed. - * All modified related objects will also be persisted in the doSave() - * method. This method wraps all precipitate database operations in a - * single transaction. - * - * @param ConnectionInterface $con - * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. - * @throws PropelException - * @see doSave() - */ - public function save(ConnectionInterface $con = null) - { - if ($this->isDeleted()) { - throw new PropelException("You cannot save an object that has been deleted."); - } - - if ($con === null) { - $con = Propel::getServiceContainer()->getWriteConnection(SocolissimoFreeshippingTableMap::DATABASE_NAME); - } - - $con->beginTransaction(); - $isInsert = $this->isNew(); - try { - $ret = $this->preSave($con); - if ($isInsert) { - $ret = $ret && $this->preInsert($con); - // timestampable behavior - if (!$this->isColumnModified(SocolissimoFreeshippingTableMap::CREATED_AT)) { - $this->setCreatedAt(time()); - } - if (!$this->isColumnModified(SocolissimoFreeshippingTableMap::UPDATED_AT)) { - $this->setUpdatedAt(time()); - } - } else { - $ret = $ret && $this->preUpdate($con); - // timestampable behavior - if ($this->isModified() && !$this->isColumnModified(SocolissimoFreeshippingTableMap::UPDATED_AT)) { - $this->setUpdatedAt(time()); - } - } - if ($ret) { - $affectedRows = $this->doSave($con); - if ($isInsert) { - $this->postInsert($con); - } else { - $this->postUpdate($con); - } - $this->postSave($con); - SocolissimoFreeshippingTableMap::addInstanceToPool($this); - } else { - $affectedRows = 0; - } - $con->commit(); - - return $affectedRows; - } catch (Exception $e) { - $con->rollBack(); - throw $e; - } - } - - /** - * Performs the work of inserting or updating the row in the database. - * - * If the object is new, it inserts it; otherwise an update is performed. - * All related objects are also updated in this method. - * - * @param ConnectionInterface $con - * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. - * @throws PropelException - * @see save() - */ - protected function doSave(ConnectionInterface $con) - { - $affectedRows = 0; // initialize var to track total num of affected rows - if (!$this->alreadyInSave) { - $this->alreadyInSave = true; - - if ($this->isNew() || $this->isModified()) { - // persist changes - if ($this->isNew()) { - $this->doInsert($con); - } else { - $this->doUpdate($con); - } - $affectedRows += 1; - $this->resetModified(); - } - - $this->alreadyInSave = false; - - } - - return $affectedRows; - } // doSave() - - /** - * Insert the row in the database. - * - * @param ConnectionInterface $con - * - * @throws PropelException - * @see doSave() - */ - protected function doInsert(ConnectionInterface $con) - { - $modifiedColumns = array(); - $index = 0; - - $this->modifiedColumns[SocolissimoFreeshippingTableMap::ID] = true; - if (null !== $this->id) { - throw new PropelException('Cannot insert a value for auto-increment primary key (' . SocolissimoFreeshippingTableMap::ID . ')'); - } - - // check the columns in natural order for more readable SQL queries - if ($this->isColumnModified(SocolissimoFreeshippingTableMap::ID)) { - $modifiedColumns[':p' . $index++] = 'ID'; - } - if ($this->isColumnModified(SocolissimoFreeshippingTableMap::ACTIVE)) { - $modifiedColumns[':p' . $index++] = 'ACTIVE'; - } - if ($this->isColumnModified(SocolissimoFreeshippingTableMap::CREATED_AT)) { - $modifiedColumns[':p' . $index++] = 'CREATED_AT'; - } - if ($this->isColumnModified(SocolissimoFreeshippingTableMap::UPDATED_AT)) { - $modifiedColumns[':p' . $index++] = 'UPDATED_AT'; - } - - $sql = sprintf( - 'INSERT INTO socolissimo_freeshipping (%s) VALUES (%s)', - implode(', ', $modifiedColumns), - implode(', ', array_keys($modifiedColumns)) - ); - - try { - $stmt = $con->prepare($sql); - foreach ($modifiedColumns as $identifier => $columnName) { - switch ($columnName) { - case 'ID': - $stmt->bindValue($identifier, $this->id, PDO::PARAM_INT); - break; - case 'ACTIVE': - $stmt->bindValue($identifier, (int) $this->active, 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; - case 'UPDATED_AT': - $stmt->bindValue($identifier, $this->updated_at ? $this->updated_at->format("Y-m-d H:i:s") : null, PDO::PARAM_STR); - break; - } - } - $stmt->execute(); - } catch (Exception $e) { - Propel::log($e->getMessage(), Propel::LOG_ERR); - throw new PropelException(sprintf('Unable to execute INSERT statement [%s]', $sql), 0, $e); - } - - try { - $pk = $con->lastInsertId(); - } catch (Exception $e) { - throw new PropelException('Unable to get autoincrement id.', 0, $e); - } - $this->setId($pk); - - $this->setNew(false); - } - - /** - * Update the row in the database. - * - * @param ConnectionInterface $con - * - * @return Integer Number of updated rows - * @see doSave() - */ - protected function doUpdate(ConnectionInterface $con) - { - $selectCriteria = $this->buildPkeyCriteria(); - $valuesCriteria = $this->buildCriteria(); - - return $selectCriteria->doUpdate($valuesCriteria, $con); - } - - /** - * Retrieves a field from the object by name passed in as a string. - * - * @param string $name name - * @param string $type The type of fieldname the $name is of: - * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. - * @return mixed Value of field. - */ - public function getByName($name, $type = TableMap::TYPE_PHPNAME) - { - $pos = SocolissimoFreeshippingTableMap::translateFieldName($name, $type, TableMap::TYPE_NUM); - $field = $this->getByPosition($pos); - - return $field; - } - - /** - * Retrieves a field from the object by Position as specified in the xml schema. - * Zero-based. - * - * @param int $pos position in xml schema - * @return mixed Value of field at $pos - */ - public function getByPosition($pos) - { - switch ($pos) { - case 0: - return $this->getId(); - break; - case 1: - return $this->getActive(); - break; - case 2: - return $this->getCreatedAt(); - break; - case 3: - return $this->getUpdatedAt(); - break; - default: - return null; - break; - } // switch() - } - - /** - * Exports the object as an array. - * - * You can specify the key type of the array by passing one of the class - * type constants. - * - * @param string $keyType (optional) One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME, - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. - * @param boolean $includeLazyLoadColumns (optional) Whether to include lazy loaded columns. Defaults to TRUE. - * @param array $alreadyDumpedObjects List of objects to skip to avoid recursion - * - * @return array an associative array containing the field names (as keys) and field values - */ - public function toArray($keyType = TableMap::TYPE_PHPNAME, $includeLazyLoadColumns = true, $alreadyDumpedObjects = array()) - { - if (isset($alreadyDumpedObjects['SocolissimoFreeshipping'][$this->getPrimaryKey()])) { - return '*RECURSION*'; - } - $alreadyDumpedObjects['SocolissimoFreeshipping'][$this->getPrimaryKey()] = true; - $keys = SocolissimoFreeshippingTableMap::getFieldNames($keyType); - $result = array( - $keys[0] => $this->getId(), - $keys[1] => $this->getActive(), - $keys[2] => $this->getCreatedAt(), - $keys[3] => $this->getUpdatedAt(), - ); - $virtualColumns = $this->virtualColumns; - foreach ($virtualColumns as $key => $virtualColumn) { - $result[$key] = $virtualColumn; - } - - - return $result; - } - - /** - * Sets a field from the object by name passed in as a string. - * - * @param string $name - * @param mixed $value field value - * @param string $type The type of fieldname the $name is of: - * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. - * @return void - */ - public function setByName($name, $value, $type = TableMap::TYPE_PHPNAME) - { - $pos = SocolissimoFreeshippingTableMap::translateFieldName($name, $type, TableMap::TYPE_NUM); - - return $this->setByPosition($pos, $value); - } - - /** - * Sets a field from the object by Position as specified in the xml schema. - * Zero-based. - * - * @param int $pos position in xml schema - * @param mixed $value field value - * @return void - */ - public function setByPosition($pos, $value) - { - switch ($pos) { - case 0: - $this->setId($value); - break; - case 1: - $this->setActive($value); - break; - case 2: - $this->setCreatedAt($value); - break; - case 3: - $this->setUpdatedAt($value); - break; - } // switch() - } - - /** - * Populates the object using an array. - * - * This is particularly useful when populating an object from one of the - * request arrays (e.g. $_POST). This method goes through the column - * names, checking to see whether a matching key exists in populated - * array. If so the setByName() method is called for that column. - * - * You can specify the key type of the array by additionally passing one - * of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME, - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * The default key type is the column's TableMap::TYPE_PHPNAME. - * - * @param array $arr An array to populate the object from. - * @param string $keyType The type of keys the array uses. - * @return void - */ - public function fromArray($arr, $keyType = TableMap::TYPE_PHPNAME) - { - $keys = SocolissimoFreeshippingTableMap::getFieldNames($keyType); - - if (array_key_exists($keys[0], $arr)) $this->setId($arr[$keys[0]]); - if (array_key_exists($keys[1], $arr)) $this->setActive($arr[$keys[1]]); - if (array_key_exists($keys[2], $arr)) $this->setCreatedAt($arr[$keys[2]]); - if (array_key_exists($keys[3], $arr)) $this->setUpdatedAt($arr[$keys[3]]); - } - - /** - * Build a Criteria object containing the values of all modified columns in this object. - * - * @return Criteria The Criteria object containing all modified values. - */ - public function buildCriteria() - { - $criteria = new Criteria(SocolissimoFreeshippingTableMap::DATABASE_NAME); - - if ($this->isColumnModified(SocolissimoFreeshippingTableMap::ID)) $criteria->add(SocolissimoFreeshippingTableMap::ID, $this->id); - if ($this->isColumnModified(SocolissimoFreeshippingTableMap::ACTIVE)) $criteria->add(SocolissimoFreeshippingTableMap::ACTIVE, $this->active); - if ($this->isColumnModified(SocolissimoFreeshippingTableMap::CREATED_AT)) $criteria->add(SocolissimoFreeshippingTableMap::CREATED_AT, $this->created_at); - if ($this->isColumnModified(SocolissimoFreeshippingTableMap::UPDATED_AT)) $criteria->add(SocolissimoFreeshippingTableMap::UPDATED_AT, $this->updated_at); - - return $criteria; - } - - /** - * Builds a Criteria object containing the primary key for this object. - * - * Unlike buildCriteria() this method includes the primary key values regardless - * of whether or not they have been modified. - * - * @return Criteria The Criteria object containing value(s) for primary key(s). - */ - public function buildPkeyCriteria() - { - $criteria = new Criteria(SocolissimoFreeshippingTableMap::DATABASE_NAME); - $criteria->add(SocolissimoFreeshippingTableMap::ID, $this->id); - - return $criteria; - } - - /** - * Returns the primary key for this object (row). - * @return int - */ - public function getPrimaryKey() - { - return $this->getId(); - } - - /** - * Generic method to set the primary key (id column). - * - * @param int $key Primary key. - * @return void - */ - public function setPrimaryKey($key) - { - $this->setId($key); - } - - /** - * Returns true if the primary key for this object is null. - * @return boolean - */ - public function isPrimaryKeyNull() - { - - return null === $this->getId(); - } - - /** - * Sets contents of passed object to values from current object. - * - * If desired, this method can also make copies of all associated (fkey referrers) - * objects. - * - * @param object $copyObj An object of \SoColissimo\Model\SocolissimoFreeshipping (or compatible) type. - * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. - * @param boolean $makeNew Whether to reset autoincrement PKs and make the object new. - * @throws PropelException - */ - public function copyInto($copyObj, $deepCopy = false, $makeNew = true) - { - $copyObj->setActive($this->getActive()); - $copyObj->setCreatedAt($this->getCreatedAt()); - $copyObj->setUpdatedAt($this->getUpdatedAt()); - if ($makeNew) { - $copyObj->setNew(true); - $copyObj->setId(NULL); // this is a auto-increment column, so set to default value - } - } - - /** - * Makes a copy of this object that will be inserted as a new row in table when saved. - * It creates a new object filling in the simple attributes, but skipping any primary - * keys that are defined for the table. - * - * If desired, this method can also make copies of all associated (fkey referrers) - * objects. - * - * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. - * @return \SoColissimo\Model\SocolissimoFreeshipping Clone of current object. - * @throws PropelException - */ - public function copy($deepCopy = false) - { - // we use get_class(), because this might be a subclass - $clazz = get_class($this); - $copyObj = new $clazz(); - $this->copyInto($copyObj, $deepCopy); - - return $copyObj; - } - - /** - * Clears the current object and sets all attributes to their default values - */ - public function clear() - { - $this->id = null; - $this->active = null; - $this->created_at = null; - $this->updated_at = null; - $this->alreadyInSave = false; - $this->clearAllReferences(); - $this->resetModified(); - $this->setNew(true); - $this->setDeleted(false); - } - - /** - * Resets all references to other model objects or collections of model objects. - * - * This method is a user-space workaround for PHP's inability to garbage collect - * objects with circular references (even in PHP 5.3). This is currently necessary - * when using Propel in certain daemon or large-volume/high-memory operations. - * - * @param boolean $deep Whether to also clear the references on all referrer objects. - */ - public function clearAllReferences($deep = false) - { - if ($deep) { - } // if ($deep) - - } - - /** - * Return the string representation of this object - * - * @return string - */ - public function __toString() - { - return (string) $this->exportTo(SocolissimoFreeshippingTableMap::DEFAULT_STRING_FORMAT); - } - - // timestampable behavior - - /** - * Mark the current object so that the update date doesn't get updated during next save - * - * @return ChildSocolissimoFreeshipping The current object (for fluent API support) - */ - public function keepUpdateDateUnchanged() - { - $this->modifiedColumns[SocolissimoFreeshippingTableMap::UPDATED_AT] = true; - - return $this; - } - - /** - * Code to be run before persisting the object - * @param ConnectionInterface $con - * @return boolean - */ - public function preSave(ConnectionInterface $con = null) - { - return true; - } - - /** - * Code to be run after persisting the object - * @param ConnectionInterface $con - */ - public function postSave(ConnectionInterface $con = null) - { - - } - - /** - * Code to be run before inserting to database - * @param ConnectionInterface $con - * @return boolean - */ - public function preInsert(ConnectionInterface $con = null) - { - return true; - } - - /** - * Code to be run after inserting to database - * @param ConnectionInterface $con - */ - public function postInsert(ConnectionInterface $con = null) - { - - } - - /** - * Code to be run before updating the object in database - * @param ConnectionInterface $con - * @return boolean - */ - public function preUpdate(ConnectionInterface $con = null) - { - return true; - } - - /** - * Code to be run after updating the object in database - * @param ConnectionInterface $con - */ - public function postUpdate(ConnectionInterface $con = null) - { - - } - - /** - * Code to be run before deleting the object in database - * @param ConnectionInterface $con - * @return boolean - */ - public function preDelete(ConnectionInterface $con = null) - { - return true; - } - - /** - * Code to be run after deleting the object in database - * @param ConnectionInterface $con - */ - public function postDelete(ConnectionInterface $con = null) - { - - } - - - /** - * Derived method to catches calls to undefined methods. - * - * Provides magic import/export method support (fromXML()/toXML(), fromYAML()/toYAML(), etc.). - * Allows to define default __call() behavior if you overwrite __call() - * - * @param string $name - * @param mixed $params - * - * @return array|string - */ - public function __call($name, $params) - { - if (0 === strpos($name, 'get')) { - $virtualColumn = substr($name, 3); - if ($this->hasVirtualColumn($virtualColumn)) { - return $this->getVirtualColumn($virtualColumn); - } - - $virtualColumn = lcfirst($virtualColumn); - if ($this->hasVirtualColumn($virtualColumn)) { - return $this->getVirtualColumn($virtualColumn); - } - } - - if (0 === strpos($name, 'from')) { - $format = substr($name, 4); - - return $this->importFrom($format, reset($params)); - } - - if (0 === strpos($name, 'to')) { - $format = substr($name, 2); - $includeLazyLoadColumns = isset($params[0]) ? $params[0] : true; - - return $this->exportTo($format, $includeLazyLoadColumns); - } - - throw new BadMethodCallException(sprintf('Call to undefined method: %s.', $name)); - } - -} diff --git a/Model/Base/SocolissimoFreeshippingQuery.php b/Model/Base/SocolissimoFreeshippingQuery.php deleted file mode 100755 index c9ac0f8..0000000 --- a/Model/Base/SocolissimoFreeshippingQuery.php +++ /dev/null @@ -1,535 +0,0 @@ -setModelAlias($modelAlias); - } - if ($criteria instanceof Criteria) { - $query->mergeWith($criteria); - } - - return $query; - } - - /** - * Find object by primary key. - * Propel uses the instance pool to skip the database if the object exists. - * Go fast if the query is untouched. - * - * - * $obj = $c->findPk(12, $con); - * - * - * @param mixed $key Primary key to use for the query - * @param ConnectionInterface $con an optional connection object - * - * @return ChildSocolissimoFreeshipping|array|mixed the result, formatted by the current formatter - */ - public function findPk($key, $con = null) - { - if ($key === null) { - return null; - } - if ((null !== ($obj = SocolissimoFreeshippingTableMap::getInstanceFromPool((string) $key))) && !$this->formatter) { - // the object is already in the instance pool - return $obj; - } - if ($con === null) { - $con = Propel::getServiceContainer()->getReadConnection(SocolissimoFreeshippingTableMap::DATABASE_NAME); - } - $this->basePreSelect($con); - if ($this->formatter || $this->modelAlias || $this->with || $this->select - || $this->selectColumns || $this->asColumns || $this->selectModifiers - || $this->map || $this->having || $this->joins) { - return $this->findPkComplex($key, $con); - } else { - return $this->findPkSimple($key, $con); - } - } - - /** - * Find object by primary key using raw SQL to go fast. - * Bypass doSelect() and the object formatter by using generated code. - * - * @param mixed $key Primary key to use for the query - * @param ConnectionInterface $con A connection object - * - * @return ChildSocolissimoFreeshipping A model object, or null if the key is not found - */ - protected function findPkSimple($key, $con) - { - $sql = 'SELECT ID, ACTIVE, CREATED_AT, UPDATED_AT FROM socolissimo_freeshipping WHERE ID = :p0'; - try { - $stmt = $con->prepare($sql); - $stmt->bindValue(':p0', $key, PDO::PARAM_INT); - $stmt->execute(); - } catch (Exception $e) { - Propel::log($e->getMessage(), Propel::LOG_ERR); - throw new PropelException(sprintf('Unable to execute SELECT statement [%s]', $sql), 0, $e); - } - $obj = null; - if ($row = $stmt->fetch(\PDO::FETCH_NUM)) { - $obj = new ChildSocolissimoFreeshipping(); - $obj->hydrate($row); - SocolissimoFreeshippingTableMap::addInstanceToPool($obj, (string) $key); - } - $stmt->closeCursor(); - - return $obj; - } - - /** - * Find object by primary key. - * - * @param mixed $key Primary key to use for the query - * @param ConnectionInterface $con A connection object - * - * @return ChildSocolissimoFreeshipping|array|mixed the result, formatted by the current formatter - */ - protected function findPkComplex($key, $con) - { - // As the query uses a PK condition, no limit(1) is necessary. - $criteria = $this->isKeepQuery() ? clone $this : $this; - $dataFetcher = $criteria - ->filterByPrimaryKey($key) - ->doSelect($con); - - return $criteria->getFormatter()->init($criteria)->formatOne($dataFetcher); - } - - /** - * Find objects by primary key - * - * $objs = $c->findPks(array(12, 56, 832), $con); - * - * @param array $keys Primary keys to use for the query - * @param ConnectionInterface $con an optional connection object - * - * @return ObjectCollection|array|mixed the list of results, formatted by the current formatter - */ - public function findPks($keys, $con = null) - { - if (null === $con) { - $con = Propel::getServiceContainer()->getReadConnection($this->getDbName()); - } - $this->basePreSelect($con); - $criteria = $this->isKeepQuery() ? clone $this : $this; - $dataFetcher = $criteria - ->filterByPrimaryKeys($keys) - ->doSelect($con); - - return $criteria->getFormatter()->init($criteria)->format($dataFetcher); - } - - /** - * Filter the query by primary key - * - * @param mixed $key Primary key to use for the query - * - * @return ChildSocolissimoFreeshippingQuery The current query, for fluid interface - */ - public function filterByPrimaryKey($key) - { - - return $this->addUsingAlias(SocolissimoFreeshippingTableMap::ID, $key, Criteria::EQUAL); - } - - /** - * Filter the query by a list of primary keys - * - * @param array $keys The list of primary key to use for the query - * - * @return ChildSocolissimoFreeshippingQuery The current query, for fluid interface - */ - public function filterByPrimaryKeys($keys) - { - - return $this->addUsingAlias(SocolissimoFreeshippingTableMap::ID, $keys, Criteria::IN); - } - - /** - * Filter the query on the id column - * - * Example usage: - * - * $query->filterById(1234); // WHERE id = 1234 - * $query->filterById(array(12, 34)); // WHERE id IN (12, 34) - * $query->filterById(array('min' => 12)); // WHERE id > 12 - * - * - * @param mixed $id The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL - * - * @return ChildSocolissimoFreeshippingQuery The current query, for fluid interface - */ - public function filterById($id = null, $comparison = null) - { - if (is_array($id)) { - $useMinMax = false; - if (isset($id['min'])) { - $this->addUsingAlias(SocolissimoFreeshippingTableMap::ID, $id['min'], Criteria::GREATER_EQUAL); - $useMinMax = true; - } - if (isset($id['max'])) { - $this->addUsingAlias(SocolissimoFreeshippingTableMap::ID, $id['max'], Criteria::LESS_EQUAL); - $useMinMax = true; - } - if ($useMinMax) { - return $this; - } - if (null === $comparison) { - $comparison = Criteria::IN; - } - } - - return $this->addUsingAlias(SocolissimoFreeshippingTableMap::ID, $id, $comparison); - } - - /** - * Filter the query on the active column - * - * Example usage: - * - * $query->filterByActive(true); // WHERE active = true - * $query->filterByActive('yes'); // WHERE active = true - * - * - * @param boolean|string $active 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 ChildSocolissimoFreeshippingQuery The current query, for fluid interface - */ - public function filterByActive($active = null, $comparison = null) - { - if (is_string($active)) { - $active = in_array(strtolower($active), array('false', 'off', '-', 'no', 'n', '0', '')) ? false : true; - } - - return $this->addUsingAlias(SocolissimoFreeshippingTableMap::ACTIVE, $active, $comparison); - } - - /** - * Filter the query on the created_at column - * - * Example usage: - * - * $query->filterByCreatedAt('2011-03-14'); // WHERE created_at = '2011-03-14' - * $query->filterByCreatedAt('now'); // WHERE created_at = '2011-03-14' - * $query->filterByCreatedAt(array('max' => 'yesterday')); // WHERE created_at > '2011-03-13' - * - * - * @param mixed $createdAt The value to use as filter. - * Values can be integers (unix timestamps), DateTime objects, or strings. - * Empty strings are treated as NULL. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL - * - * @return ChildSocolissimoFreeshippingQuery The current query, for fluid interface - */ - public function filterByCreatedAt($createdAt = null, $comparison = null) - { - if (is_array($createdAt)) { - $useMinMax = false; - if (isset($createdAt['min'])) { - $this->addUsingAlias(SocolissimoFreeshippingTableMap::CREATED_AT, $createdAt['min'], Criteria::GREATER_EQUAL); - $useMinMax = true; - } - if (isset($createdAt['max'])) { - $this->addUsingAlias(SocolissimoFreeshippingTableMap::CREATED_AT, $createdAt['max'], Criteria::LESS_EQUAL); - $useMinMax = true; - } - if ($useMinMax) { - return $this; - } - if (null === $comparison) { - $comparison = Criteria::IN; - } - } - - return $this->addUsingAlias(SocolissimoFreeshippingTableMap::CREATED_AT, $createdAt, $comparison); - } - - /** - * Filter the query on the updated_at column - * - * Example usage: - * - * $query->filterByUpdatedAt('2011-03-14'); // WHERE updated_at = '2011-03-14' - * $query->filterByUpdatedAt('now'); // WHERE updated_at = '2011-03-14' - * $query->filterByUpdatedAt(array('max' => 'yesterday')); // WHERE updated_at > '2011-03-13' - * - * - * @param mixed $updatedAt The value to use as filter. - * Values can be integers (unix timestamps), DateTime objects, or strings. - * Empty strings are treated as NULL. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL - * - * @return ChildSocolissimoFreeshippingQuery The current query, for fluid interface - */ - public function filterByUpdatedAt($updatedAt = null, $comparison = null) - { - if (is_array($updatedAt)) { - $useMinMax = false; - if (isset($updatedAt['min'])) { - $this->addUsingAlias(SocolissimoFreeshippingTableMap::UPDATED_AT, $updatedAt['min'], Criteria::GREATER_EQUAL); - $useMinMax = true; - } - if (isset($updatedAt['max'])) { - $this->addUsingAlias(SocolissimoFreeshippingTableMap::UPDATED_AT, $updatedAt['max'], Criteria::LESS_EQUAL); - $useMinMax = true; - } - if ($useMinMax) { - return $this; - } - if (null === $comparison) { - $comparison = Criteria::IN; - } - } - - return $this->addUsingAlias(SocolissimoFreeshippingTableMap::UPDATED_AT, $updatedAt, $comparison); - } - - /** - * Exclude object from result - * - * @param ChildSocolissimoFreeshipping $socolissimoFreeshipping Object to remove from the list of results - * - * @return ChildSocolissimoFreeshippingQuery The current query, for fluid interface - */ - public function prune($socolissimoFreeshipping = null) - { - if ($socolissimoFreeshipping) { - $this->addUsingAlias(SocolissimoFreeshippingTableMap::ID, $socolissimoFreeshipping->getId(), Criteria::NOT_EQUAL); - } - - return $this; - } - - /** - * Deletes all rows from the socolissimo_freeshipping table. - * - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). - */ - public function doDeleteAll(ConnectionInterface $con = null) - { - if (null === $con) { - $con = Propel::getServiceContainer()->getWriteConnection(SocolissimoFreeshippingTableMap::DATABASE_NAME); - } - $affectedRows = 0; // initialize var to track total num of affected rows - try { - // use transaction because $criteria could contain info - // for more than one table or we could emulating ON DELETE CASCADE, etc. - $con->beginTransaction(); - $affectedRows += parent::doDeleteAll($con); - // Because this db requires some delete cascade/set null emulation, we have to - // clear the cached instance *after* the emulation has happened (since - // instances get re-added by the select statement contained therein). - SocolissimoFreeshippingTableMap::clearInstancePool(); - SocolissimoFreeshippingTableMap::clearRelatedInstancePool(); - - $con->commit(); - } catch (PropelException $e) { - $con->rollBack(); - throw $e; - } - - return $affectedRows; - } - - /** - * Performs a DELETE on the database, given a ChildSocolissimoFreeshipping or Criteria object OR a primary key value. - * - * @param mixed $values Criteria or ChildSocolissimoFreeshipping object or primary key or array of primary keys - * which is used to create the DELETE statement - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows - * if supported by native driver or if emulated using Propel. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. - */ - public function delete(ConnectionInterface $con = null) - { - if (null === $con) { - $con = Propel::getServiceContainer()->getWriteConnection(SocolissimoFreeshippingTableMap::DATABASE_NAME); - } - - $criteria = $this; - - // Set the correct dbName - $criteria->setDbName(SocolissimoFreeshippingTableMap::DATABASE_NAME); - - $affectedRows = 0; // initialize var to track total num of affected rows - - try { - // use transaction because $criteria could contain info - // for more than one table or we could emulating ON DELETE CASCADE, etc. - $con->beginTransaction(); - - - SocolissimoFreeshippingTableMap::removeInstanceFromPool($criteria); - - $affectedRows += ModelCriteria::delete($con); - SocolissimoFreeshippingTableMap::clearRelatedInstancePool(); - $con->commit(); - - return $affectedRows; - } catch (PropelException $e) { - $con->rollBack(); - throw $e; - } - } - - // timestampable behavior - - /** - * Filter by the latest updated - * - * @param int $nbDays Maximum age of the latest update in days - * - * @return ChildSocolissimoFreeshippingQuery The current query, for fluid interface - */ - public function recentlyUpdated($nbDays = 7) - { - return $this->addUsingAlias(SocolissimoFreeshippingTableMap::UPDATED_AT, time() - $nbDays * 24 * 60 * 60, Criteria::GREATER_EQUAL); - } - - /** - * Filter by the latest created - * - * @param int $nbDays Maximum age of in days - * - * @return ChildSocolissimoFreeshippingQuery The current query, for fluid interface - */ - public function recentlyCreated($nbDays = 7) - { - return $this->addUsingAlias(SocolissimoFreeshippingTableMap::CREATED_AT, time() - $nbDays * 24 * 60 * 60, Criteria::GREATER_EQUAL); - } - - /** - * Order by update date desc - * - * @return ChildSocolissimoFreeshippingQuery The current query, for fluid interface - */ - public function lastUpdatedFirst() - { - return $this->addDescendingOrderByColumn(SocolissimoFreeshippingTableMap::UPDATED_AT); - } - - /** - * Order by update date asc - * - * @return ChildSocolissimoFreeshippingQuery The current query, for fluid interface - */ - public function firstUpdatedFirst() - { - return $this->addAscendingOrderByColumn(SocolissimoFreeshippingTableMap::UPDATED_AT); - } - - /** - * Order by create date desc - * - * @return ChildSocolissimoFreeshippingQuery The current query, for fluid interface - */ - public function lastCreatedFirst() - { - return $this->addDescendingOrderByColumn(SocolissimoFreeshippingTableMap::CREATED_AT); - } - - /** - * Order by create date asc - * - * @return ChildSocolissimoFreeshippingQuery The current query, for fluid interface - */ - public function firstCreatedFirst() - { - return $this->addAscendingOrderByColumn(SocolissimoFreeshippingTableMap::CREATED_AT); - } - -} // SocolissimoFreeshippingQuery diff --git a/Model/Map/AddressSocolissimoTableMap.php b/Model/Map/AddressSocolissimoTableMap.php old mode 100755 new mode 100644 diff --git a/Model/Map/OrderAddressSocolissimoTableMap.php b/Model/Map/OrderAddressSocolissimoTableMap.php old mode 100755 new mode 100644 diff --git a/Model/Map/SocolissimoAreaFreeshippingTableMap.php b/Model/Map/SocolissimoAreaFreeshippingTableMap.php deleted file mode 100644 index 90df0ba..0000000 --- a/Model/Map/SocolissimoAreaFreeshippingTableMap.php +++ /dev/null @@ -1,428 +0,0 @@ - array('Id', 'AreaId', 'DeliveryModeId', 'CartAmount', ), - self::TYPE_STUDLYPHPNAME => array('id', 'areaId', 'deliveryModeId', 'cartAmount', ), - self::TYPE_COLNAME => array(SocolissimoAreaFreeshippingTableMap::ID, SocolissimoAreaFreeshippingTableMap::AREA_ID, SocolissimoAreaFreeshippingTableMap::DELIVERY_MODE_ID, SocolissimoAreaFreeshippingTableMap::CART_AMOUNT, ), - self::TYPE_RAW_COLNAME => array('ID', 'AREA_ID', 'DELIVERY_MODE_ID', 'CART_AMOUNT', ), - self::TYPE_FIELDNAME => array('id', 'area_id', 'delivery_mode_id', 'cart_amount', ), - self::TYPE_NUM => array(0, 1, 2, 3, ) - ); - - /** - * holds an array of keys for quick access to the fieldnames array - * - * first dimension keys are the type constants - * e.g. self::$fieldKeys[self::TYPE_PHPNAME]['Id'] = 0 - */ - protected static $fieldKeys = array ( - self::TYPE_PHPNAME => array('Id' => 0, 'AreaId' => 1, 'DeliveryModeId' => 2, 'CartAmount' => 3, ), - self::TYPE_STUDLYPHPNAME => array('id' => 0, 'areaId' => 1, 'deliveryModeId' => 2, 'cartAmount' => 3, ), - self::TYPE_COLNAME => array(SocolissimoAreaFreeshippingTableMap::ID => 0, SocolissimoAreaFreeshippingTableMap::AREA_ID => 1, SocolissimoAreaFreeshippingTableMap::DELIVERY_MODE_ID => 2, SocolissimoAreaFreeshippingTableMap::CART_AMOUNT => 3, ), - self::TYPE_RAW_COLNAME => array('ID' => 0, 'AREA_ID' => 1, 'DELIVERY_MODE_ID' => 2, 'CART_AMOUNT' => 3, ), - self::TYPE_FIELDNAME => array('id' => 0, 'area_id' => 1, 'delivery_mode_id' => 2, 'cart_amount' => 3, ), - self::TYPE_NUM => array(0, 1, 2, 3, ) - ); - - /** - * Initialize the table attributes and columns - * Relations are not initialized by this method since they are lazy loaded - * - * @return void - * @throws PropelException - */ - public function initialize() - { - // attributes - $this->setName('socolissimo_area_freeshipping'); - $this->setPhpName('SocolissimoAreaFreeshipping'); - $this->setClassName('\\SoColissimo\\Model\\SocolissimoAreaFreeshipping'); - $this->setPackage('SoColissimo.Model'); - $this->setUseIdGenerator(true); - // columns - $this->addPrimaryKey('ID', 'Id', 'INTEGER', true, null, null); - $this->addForeignKey('AREA_ID', 'AreaId', 'INTEGER', 'area', 'ID', true, null, null); - $this->addForeignKey('DELIVERY_MODE_ID', 'DeliveryModeId', 'INTEGER', 'socolissimo_delivery_mode', 'ID', true, null, null); - $this->addColumn('CART_AMOUNT', 'CartAmount', 'DECIMAL', true, 16, 0); - } // initialize() - - /** - * Build the RelationMap objects for this table relationships - */ - public function buildRelations() - { - $this->addRelation('Area', '\\SoColissimo\\Model\\Thelia\\Model\\Area', RelationMap::MANY_TO_ONE, array('area_id' => 'id', ), 'RESTRICT', 'RESTRICT'); - $this->addRelation('SocolissimoDeliveryMode', '\\SoColissimo\\Model\\SocolissimoDeliveryMode', RelationMap::MANY_TO_ONE, array('delivery_mode_id' => 'id', ), 'RESTRICT', 'RESTRICT'); - } // buildRelations() - - /** - * Retrieves a string version of the primary key from the DB resultset row that can be used to uniquely identify a row in this table. - * - * For tables with a single-column primary key, that simple pkey value will be returned. For tables with - * a multi-column primary key, a serialize()d version of the primary key will be returned. - * - * @param array $row resultset row. - * @param int $offset The 0-based offset for reading from the resultset row. - * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM - */ - public static function getPrimaryKeyHashFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM) - { - // If the PK cannot be derived from the row, return NULL. - if ($row[TableMap::TYPE_NUM == $indexType ? 0 + $offset : static::translateFieldName('Id', TableMap::TYPE_PHPNAME, $indexType)] === null) { - return null; - } - - return (string) $row[TableMap::TYPE_NUM == $indexType ? 0 + $offset : static::translateFieldName('Id', TableMap::TYPE_PHPNAME, $indexType)]; - } - - /** - * Retrieves the primary key from the DB resultset row - * For tables with a single-column primary key, that simple pkey value will be returned. For tables with - * a multi-column primary key, an array of the primary key columns will be returned. - * - * @param array $row resultset row. - * @param int $offset The 0-based offset for reading from the resultset row. - * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM - * - * @return mixed The primary key of the row - */ - public static function getPrimaryKeyFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM) - { - - return (int) $row[ - $indexType == TableMap::TYPE_NUM - ? 0 + $offset - : self::translateFieldName('Id', TableMap::TYPE_PHPNAME, $indexType) - ]; - } - - /** - * The class that the tableMap will make instances of. - * - * If $withPrefix is true, the returned path - * uses a dot-path notation which is translated into a path - * relative to a location on the PHP include_path. - * (e.g. path.to.MyClass -> 'path/to/MyClass.php') - * - * @param boolean $withPrefix Whether or not to return the path with the class name - * @return string path.to.ClassName - */ - public static function getOMClass($withPrefix = true) - { - return $withPrefix ? SocolissimoAreaFreeshippingTableMap::CLASS_DEFAULT : SocolissimoAreaFreeshippingTableMap::OM_CLASS; - } - - /** - * Populates an object of the default type or an object that inherit from the default. - * - * @param array $row row returned by DataFetcher->fetch(). - * @param int $offset The 0-based offset for reading from the resultset row. - * @param string $indexType The index type of $row. Mostly DataFetcher->getIndexType(). - One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. - * @return array (SocolissimoAreaFreeshipping object, last column rank) - */ - public static function populateObject($row, $offset = 0, $indexType = TableMap::TYPE_NUM) - { - $key = SocolissimoAreaFreeshippingTableMap::getPrimaryKeyHashFromRow($row, $offset, $indexType); - if (null !== ($obj = SocolissimoAreaFreeshippingTableMap::getInstanceFromPool($key))) { - // We no longer rehydrate the object, since this can cause data loss. - // See http://www.propelorm.org/ticket/509 - // $obj->hydrate($row, $offset, true); // rehydrate - $col = $offset + SocolissimoAreaFreeshippingTableMap::NUM_HYDRATE_COLUMNS; - } else { - $cls = SocolissimoAreaFreeshippingTableMap::OM_CLASS; - $obj = new $cls(); - $col = $obj->hydrate($row, $offset, false, $indexType); - SocolissimoAreaFreeshippingTableMap::addInstanceToPool($obj, $key); - } - - return array($obj, $col); - } - - /** - * The returned array will contain objects of the default type or - * objects that inherit from the default. - * - * @param DataFetcherInterface $dataFetcher - * @return array - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. - */ - public static function populateObjects(DataFetcherInterface $dataFetcher) - { - $results = array(); - - // set the class once to avoid overhead in the loop - $cls = static::getOMClass(false); - // populate the object(s) - while ($row = $dataFetcher->fetch()) { - $key = SocolissimoAreaFreeshippingTableMap::getPrimaryKeyHashFromRow($row, 0, $dataFetcher->getIndexType()); - if (null !== ($obj = SocolissimoAreaFreeshippingTableMap::getInstanceFromPool($key))) { - // We no longer rehydrate the object, since this can cause data loss. - // See http://www.propelorm.org/ticket/509 - // $obj->hydrate($row, 0, true); // rehydrate - $results[] = $obj; - } else { - $obj = new $cls(); - $obj->hydrate($row); - $results[] = $obj; - SocolissimoAreaFreeshippingTableMap::addInstanceToPool($obj, $key); - } // if key exists - } - - return $results; - } - /** - * Add all the columns needed to create a new object. - * - * Note: any columns that were marked with lazyLoad="true" in the - * XML schema will not be added to the select list and only loaded - * on demand. - * - * @param Criteria $criteria object containing the columns to add. - * @param string $alias optional table alias - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. - */ - public static function addSelectColumns(Criteria $criteria, $alias = null) - { - if (null === $alias) { - $criteria->addSelectColumn(SocolissimoAreaFreeshippingTableMap::ID); - $criteria->addSelectColumn(SocolissimoAreaFreeshippingTableMap::AREA_ID); - $criteria->addSelectColumn(SocolissimoAreaFreeshippingTableMap::DELIVERY_MODE_ID); - $criteria->addSelectColumn(SocolissimoAreaFreeshippingTableMap::CART_AMOUNT); - } else { - $criteria->addSelectColumn($alias . '.ID'); - $criteria->addSelectColumn($alias . '.AREA_ID'); - $criteria->addSelectColumn($alias . '.DELIVERY_MODE_ID'); - $criteria->addSelectColumn($alias . '.CART_AMOUNT'); - } - } - - /** - * Returns the TableMap related to this object. - * This method is not needed for general use but a specific application could have a need. - * @return TableMap - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. - */ - public static function getTableMap() - { - return Propel::getServiceContainer()->getDatabaseMap(SocolissimoAreaFreeshippingTableMap::DATABASE_NAME)->getTable(SocolissimoAreaFreeshippingTableMap::TABLE_NAME); - } - - /** - * Add a TableMap instance to the database for this tableMap class. - */ - public static function buildTableMap() - { - $dbMap = Propel::getServiceContainer()->getDatabaseMap(SocolissimoAreaFreeshippingTableMap::DATABASE_NAME); - if (!$dbMap->hasTable(SocolissimoAreaFreeshippingTableMap::TABLE_NAME)) { - $dbMap->addTableObject(new SocolissimoAreaFreeshippingTableMap()); - } - } - - /** - * Performs a DELETE on the database, given a SocolissimoAreaFreeshipping or Criteria object OR a primary key value. - * - * @param mixed $values Criteria or SocolissimoAreaFreeshipping object or primary key or array of primary keys - * which is used to create the DELETE statement - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows - * if supported by native driver or if emulated using Propel. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. - */ - public static function doDelete($values, ConnectionInterface $con = null) - { - if (null === $con) { - $con = Propel::getServiceContainer()->getWriteConnection(SocolissimoAreaFreeshippingTableMap::DATABASE_NAME); - } - - if ($values instanceof Criteria) { - // rename for clarity - $criteria = $values; - } elseif ($values instanceof \SoColissimo\Model\SocolissimoAreaFreeshipping) { // it's a model object - // create criteria based on pk values - $criteria = $values->buildPkeyCriteria(); - } else { // it's a primary key, or an array of pks - $criteria = new Criteria(SocolissimoAreaFreeshippingTableMap::DATABASE_NAME); - $criteria->add(SocolissimoAreaFreeshippingTableMap::ID, (array) $values, Criteria::IN); - } - - $query = SocolissimoAreaFreeshippingQuery::create()->mergeWith($criteria); - - if ($values instanceof Criteria) { SocolissimoAreaFreeshippingTableMap::clearInstancePool(); - } elseif (!is_object($values)) { // it's a primary key, or an array of pks - foreach ((array) $values as $singleval) { SocolissimoAreaFreeshippingTableMap::removeInstanceFromPool($singleval); - } - } - - return $query->delete($con); - } - - /** - * Deletes all rows from the socolissimo_area_freeshipping table. - * - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). - */ - public static function doDeleteAll(ConnectionInterface $con = null) - { - return SocolissimoAreaFreeshippingQuery::create()->doDeleteAll($con); - } - - /** - * Performs an INSERT on the database, given a SocolissimoAreaFreeshipping or Criteria object. - * - * @param mixed $criteria Criteria or SocolissimoAreaFreeshipping object containing data that is used to create the INSERT statement. - * @param ConnectionInterface $con the ConnectionInterface connection to use - * @return mixed The new primary key. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. - */ - public static function doInsert($criteria, ConnectionInterface $con = null) - { - if (null === $con) { - $con = Propel::getServiceContainer()->getWriteConnection(SocolissimoAreaFreeshippingTableMap::DATABASE_NAME); - } - - if ($criteria instanceof Criteria) { - $criteria = clone $criteria; // rename for clarity - } else { - $criteria = $criteria->buildCriteria(); // build Criteria from SocolissimoAreaFreeshipping object - } - - if ($criteria->containsKey(SocolissimoAreaFreeshippingTableMap::ID) && $criteria->keyContainsValue(SocolissimoAreaFreeshippingTableMap::ID) ) { - throw new PropelException('Cannot insert a value for auto-increment primary key ('.SocolissimoAreaFreeshippingTableMap::ID.')'); - } - - - // Set the correct dbName - $query = SocolissimoAreaFreeshippingQuery::create()->mergeWith($criteria); - - try { - // use transaction because $criteria could contain info - // for more than one table (I guess, conceivably) - $con->beginTransaction(); - $pk = $query->doInsert($con); - $con->commit(); - } catch (PropelException $e) { - $con->rollBack(); - throw $e; - } - - return $pk; - } - -} // SocolissimoAreaFreeshippingTableMap -// This is the static code needed to register the TableMap for this table with the main Propel class. -// -SocolissimoAreaFreeshippingTableMap::buildTableMap(); diff --git a/Model/Map/SocolissimoFreeshippingTableMap.php b/Model/Map/SocolissimoFreeshippingTableMap.php deleted file mode 100755 index 9ad970e..0000000 --- a/Model/Map/SocolissimoFreeshippingTableMap.php +++ /dev/null @@ -1,439 +0,0 @@ - array('Id', 'Active', 'CreatedAt', 'UpdatedAt', ), - self::TYPE_STUDLYPHPNAME => array('id', 'active', 'createdAt', 'updatedAt', ), - self::TYPE_COLNAME => array(SocolissimoFreeshippingTableMap::ID, SocolissimoFreeshippingTableMap::ACTIVE, SocolissimoFreeshippingTableMap::CREATED_AT, SocolissimoFreeshippingTableMap::UPDATED_AT, ), - self::TYPE_RAW_COLNAME => array('ID', 'ACTIVE', 'CREATED_AT', 'UPDATED_AT', ), - self::TYPE_FIELDNAME => array('id', 'active', 'created_at', 'updated_at', ), - self::TYPE_NUM => array(0, 1, 2, 3, ) - ); - - /** - * holds an array of keys for quick access to the fieldnames array - * - * first dimension keys are the type constants - * e.g. self::$fieldKeys[self::TYPE_PHPNAME]['Id'] = 0 - */ - protected static $fieldKeys = array ( - self::TYPE_PHPNAME => array('Id' => 0, 'Active' => 1, 'CreatedAt' => 2, 'UpdatedAt' => 3, ), - self::TYPE_STUDLYPHPNAME => array('id' => 0, 'active' => 1, 'createdAt' => 2, 'updatedAt' => 3, ), - self::TYPE_COLNAME => array(SocolissimoFreeshippingTableMap::ID => 0, SocolissimoFreeshippingTableMap::ACTIVE => 1, SocolissimoFreeshippingTableMap::CREATED_AT => 2, SocolissimoFreeshippingTableMap::UPDATED_AT => 3, ), - self::TYPE_RAW_COLNAME => array('ID' => 0, 'ACTIVE' => 1, 'CREATED_AT' => 2, 'UPDATED_AT' => 3, ), - self::TYPE_FIELDNAME => array('id' => 0, 'active' => 1, 'created_at' => 2, 'updated_at' => 3, ), - self::TYPE_NUM => array(0, 1, 2, 3, ) - ); - - /** - * Initialize the table attributes and columns - * Relations are not initialized by this method since they are lazy loaded - * - * @return void - * @throws PropelException - */ - public function initialize() - { - // attributes - $this->setName('socolissimo_freeshipping'); - $this->setPhpName('SocolissimoFreeshipping'); - $this->setClassName('\\SoColissimo\\Model\\SocolissimoFreeshipping'); - $this->setPackage('SoColissimo.Model'); - $this->setUseIdGenerator(true); - // columns - $this->addPrimaryKey('ID', 'Id', 'INTEGER', true, null, null); - $this->addColumn('ACTIVE', 'Active', 'BOOLEAN', true, 1, null); - $this->addColumn('CREATED_AT', 'CreatedAt', 'TIMESTAMP', false, null, null); - $this->addColumn('UPDATED_AT', 'UpdatedAt', 'TIMESTAMP', false, null, null); - } // initialize() - - /** - * Build the RelationMap objects for this table relationships - */ - public function buildRelations() - { - } // buildRelations() - - /** - * - * Gets the list of behaviors registered for this table - * - * @return array Associative array (name => parameters) of behaviors - */ - public function getBehaviors() - { - return array( - 'timestampable' => array('create_column' => 'created_at', 'update_column' => 'updated_at', ), - ); - } // getBehaviors() - - /** - * Retrieves a string version of the primary key from the DB resultset row that can be used to uniquely identify a row in this table. - * - * For tables with a single-column primary key, that simple pkey value will be returned. For tables with - * a multi-column primary key, a serialize()d version of the primary key will be returned. - * - * @param array $row resultset row. - * @param int $offset The 0-based offset for reading from the resultset row. - * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM - */ - public static function getPrimaryKeyHashFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM) - { - // If the PK cannot be derived from the row, return NULL. - if ($row[TableMap::TYPE_NUM == $indexType ? 0 + $offset : static::translateFieldName('Id', TableMap::TYPE_PHPNAME, $indexType)] === null) { - return null; - } - - return (string) $row[TableMap::TYPE_NUM == $indexType ? 0 + $offset : static::translateFieldName('Id', TableMap::TYPE_PHPNAME, $indexType)]; - } - - /** - * Retrieves the primary key from the DB resultset row - * For tables with a single-column primary key, that simple pkey value will be returned. For tables with - * a multi-column primary key, an array of the primary key columns will be returned. - * - * @param array $row resultset row. - * @param int $offset The 0-based offset for reading from the resultset row. - * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM - * - * @return mixed The primary key of the row - */ - public static function getPrimaryKeyFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM) - { - - return (int) $row[ - $indexType == TableMap::TYPE_NUM - ? 0 + $offset - : self::translateFieldName('Id', TableMap::TYPE_PHPNAME, $indexType) - ]; - } - - /** - * The class that the tableMap will make instances of. - * - * If $withPrefix is true, the returned path - * uses a dot-path notation which is translated into a path - * relative to a location on the PHP include_path. - * (e.g. path.to.MyClass -> 'path/to/MyClass.php') - * - * @param boolean $withPrefix Whether or not to return the path with the class name - * @return string path.to.ClassName - */ - public static function getOMClass($withPrefix = true) - { - return $withPrefix ? SocolissimoFreeshippingTableMap::CLASS_DEFAULT : SocolissimoFreeshippingTableMap::OM_CLASS; - } - - /** - * Populates an object of the default type or an object that inherit from the default. - * - * @param array $row row returned by DataFetcher->fetch(). - * @param int $offset The 0-based offset for reading from the resultset row. - * @param string $indexType The index type of $row. Mostly DataFetcher->getIndexType(). - One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. - * @return array (SocolissimoFreeshipping object, last column rank) - */ - public static function populateObject($row, $offset = 0, $indexType = TableMap::TYPE_NUM) - { - $key = SocolissimoFreeshippingTableMap::getPrimaryKeyHashFromRow($row, $offset, $indexType); - if (null !== ($obj = SocolissimoFreeshippingTableMap::getInstanceFromPool($key))) { - // We no longer rehydrate the object, since this can cause data loss. - // See http://www.propelorm.org/ticket/509 - // $obj->hydrate($row, $offset, true); // rehydrate - $col = $offset + SocolissimoFreeshippingTableMap::NUM_HYDRATE_COLUMNS; - } else { - $cls = SocolissimoFreeshippingTableMap::OM_CLASS; - $obj = new $cls(); - $col = $obj->hydrate($row, $offset, false, $indexType); - SocolissimoFreeshippingTableMap::addInstanceToPool($obj, $key); - } - - return array($obj, $col); - } - - /** - * The returned array will contain objects of the default type or - * objects that inherit from the default. - * - * @param DataFetcherInterface $dataFetcher - * @return array - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. - */ - public static function populateObjects(DataFetcherInterface $dataFetcher) - { - $results = array(); - - // set the class once to avoid overhead in the loop - $cls = static::getOMClass(false); - // populate the object(s) - while ($row = $dataFetcher->fetch()) { - $key = SocolissimoFreeshippingTableMap::getPrimaryKeyHashFromRow($row, 0, $dataFetcher->getIndexType()); - if (null !== ($obj = SocolissimoFreeshippingTableMap::getInstanceFromPool($key))) { - // We no longer rehydrate the object, since this can cause data loss. - // See http://www.propelorm.org/ticket/509 - // $obj->hydrate($row, 0, true); // rehydrate - $results[] = $obj; - } else { - $obj = new $cls(); - $obj->hydrate($row); - $results[] = $obj; - SocolissimoFreeshippingTableMap::addInstanceToPool($obj, $key); - } // if key exists - } - - return $results; - } - /** - * Add all the columns needed to create a new object. - * - * Note: any columns that were marked with lazyLoad="true" in the - * XML schema will not be added to the select list and only loaded - * on demand. - * - * @param Criteria $criteria object containing the columns to add. - * @param string $alias optional table alias - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. - */ - public static function addSelectColumns(Criteria $criteria, $alias = null) - { - if (null === $alias) { - $criteria->addSelectColumn(SocolissimoFreeshippingTableMap::ID); - $criteria->addSelectColumn(SocolissimoFreeshippingTableMap::ACTIVE); - $criteria->addSelectColumn(SocolissimoFreeshippingTableMap::CREATED_AT); - $criteria->addSelectColumn(SocolissimoFreeshippingTableMap::UPDATED_AT); - } else { - $criteria->addSelectColumn($alias . '.ID'); - $criteria->addSelectColumn($alias . '.ACTIVE'); - $criteria->addSelectColumn($alias . '.CREATED_AT'); - $criteria->addSelectColumn($alias . '.UPDATED_AT'); - } - } - - /** - * Returns the TableMap related to this object. - * This method is not needed for general use but a specific application could have a need. - * @return TableMap - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. - */ - public static function getTableMap() - { - return Propel::getServiceContainer()->getDatabaseMap(SocolissimoFreeshippingTableMap::DATABASE_NAME)->getTable(SocolissimoFreeshippingTableMap::TABLE_NAME); - } - - /** - * Add a TableMap instance to the database for this tableMap class. - */ - public static function buildTableMap() - { - $dbMap = Propel::getServiceContainer()->getDatabaseMap(SocolissimoFreeshippingTableMap::DATABASE_NAME); - if (!$dbMap->hasTable(SocolissimoFreeshippingTableMap::TABLE_NAME)) { - $dbMap->addTableObject(new SocolissimoFreeshippingTableMap()); - } - } - - /** - * Performs a DELETE on the database, given a SocolissimoFreeshipping or Criteria object OR a primary key value. - * - * @param mixed $values Criteria or SocolissimoFreeshipping object or primary key or array of primary keys - * which is used to create the DELETE statement - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows - * if supported by native driver or if emulated using Propel. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. - */ - public static function doDelete($values, ConnectionInterface $con = null) - { - if (null === $con) { - $con = Propel::getServiceContainer()->getWriteConnection(SocolissimoFreeshippingTableMap::DATABASE_NAME); - } - - if ($values instanceof Criteria) { - // rename for clarity - $criteria = $values; - } elseif ($values instanceof \SoColissimo\Model\SocolissimoFreeshipping) { // it's a model object - // create criteria based on pk values - $criteria = $values->buildPkeyCriteria(); - } else { // it's a primary key, or an array of pks - $criteria = new Criteria(SocolissimoFreeshippingTableMap::DATABASE_NAME); - $criteria->add(SocolissimoFreeshippingTableMap::ID, (array) $values, Criteria::IN); - } - - $query = SocolissimoFreeshippingQuery::create()->mergeWith($criteria); - - if ($values instanceof Criteria) { SocolissimoFreeshippingTableMap::clearInstancePool(); - } elseif (!is_object($values)) { // it's a primary key, or an array of pks - foreach ((array) $values as $singleval) { SocolissimoFreeshippingTableMap::removeInstanceFromPool($singleval); - } - } - - return $query->delete($con); - } - - /** - * Deletes all rows from the socolissimo_freeshipping table. - * - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). - */ - public static function doDeleteAll(ConnectionInterface $con = null) - { - return SocolissimoFreeshippingQuery::create()->doDeleteAll($con); - } - - /** - * Performs an INSERT on the database, given a SocolissimoFreeshipping or Criteria object. - * - * @param mixed $criteria Criteria or SocolissimoFreeshipping object containing data that is used to create the INSERT statement. - * @param ConnectionInterface $con the ConnectionInterface connection to use - * @return mixed The new primary key. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. - */ - public static function doInsert($criteria, ConnectionInterface $con = null) - { - if (null === $con) { - $con = Propel::getServiceContainer()->getWriteConnection(SocolissimoFreeshippingTableMap::DATABASE_NAME); - } - - if ($criteria instanceof Criteria) { - $criteria = clone $criteria; // rename for clarity - } else { - $criteria = $criteria->buildCriteria(); // build Criteria from SocolissimoFreeshipping object - } - - if ($criteria->containsKey(SocolissimoFreeshippingTableMap::ID) && $criteria->keyContainsValue(SocolissimoFreeshippingTableMap::ID) ) { - throw new PropelException('Cannot insert a value for auto-increment primary key ('.SocolissimoFreeshippingTableMap::ID.')'); - } - - - // Set the correct dbName - $query = SocolissimoFreeshippingQuery::create()->mergeWith($criteria); - - try { - // use transaction because $criteria could contain info - // for more than one table (I guess, conceivably) - $con->beginTransaction(); - $pk = $query->doInsert($con); - $con->commit(); - } catch (PropelException $e) { - $con->rollBack(); - throw $e; - } - - return $pk; - } - -} // SocolissimoFreeshippingTableMap -// This is the static code needed to register the TableMap for this table with the main Propel class. -// -SocolissimoFreeshippingTableMap::buildTableMap(); diff --git a/Model/OrderAddressSocolissimo.php b/Model/OrderAddressSocolissimo.php old mode 100755 new mode 100644 diff --git a/Model/OrderAddressSocolissimoQuery.php b/Model/OrderAddressSocolissimoQuery.php old mode 100755 new mode 100644 index 6f38100..5434b7b --- a/Model/OrderAddressSocolissimoQuery.php +++ b/Model/OrderAddressSocolissimoQuery.php @@ -4,6 +4,7 @@ use SoColissimo\Model\Base\OrderAddressSocolissimoQuery as BaseOrderAddressSocolissimoQuery; + /** * Skeleton subclass for performing query and update operations on the 'order_address_socolissimo' table. * diff --git a/Model/SocolissimoAreaFreeshipping.php b/Model/SocolissimoAreaFreeshipping.php deleted file mode 100644 index f8a8df3..0000000 --- a/Model/SocolissimoAreaFreeshipping.php +++ /dev/null @@ -1,10 +0,0 @@ -orderById('desc')->findOne()->getActive(); - } -} // SocolissimoFreeshippingQuery diff --git a/SoColissimo.php b/SoColissimo.php index 7a0e0f5..94941eb 100755 --- a/SoColissimo.php +++ b/SoColissimo.php @@ -44,6 +44,7 @@ use Thelia\Install\Database; use Thelia\Module\AbstractDeliveryModule; use Thelia\Module\Exception\DeliveryException; +use Thelia\Tools\Version\Version; class SoColissimo extends AbstractDeliveryModule { @@ -219,8 +220,8 @@ public function getPostage(Country $country) } $postage = null; - if (null === $postage = self::getMinPostage($areaIdArray, $cartWeight, $cartAmount, $deliveryModeCode)) { - $postage = self::getMinPostage($areaIdArray, $cartWeight, $cartAmount, 'dom'); + if (null === $postage = $this->getMinPostage($areaIdArray, $cartWeight, $cartAmount, $deliveryModeCode)) { + $postage = $this->getMinPostage($areaIdArray, $cartWeight, $cartAmount, 'dom'); if (null === $postage) { throw new DeliveryException("Colissimo delivery unavailable for your cart weight or delivery country"); } @@ -276,10 +277,7 @@ private function getAllAreasForCountry(Country $country) return $areaArray; } - - - - + /** Return the module code */ public function getCode() { return 'SoColissimo'; @@ -341,6 +339,62 @@ public static function importJsonPrice(SocolissimoDeliveryMode $deliveryMode, Co } } + protected function checkModuleConfig() { + /** If this isn't set, this means it's the first time we start the module or it's updating from < 2.0.0 */ + if (null === self::getConfigValue('socolissimo-rework-2')) { + /** + * We check for every ConfigQuery the old version of the module set. + * We delete them if they exist, and we set a module config instead + */ + + /** Colissimo Username / Account number */ + self::setConfigValue('socolissimo_username', ''); + if (null !== $value = ConfigQuery::read('socolissimo_login')) { + self::setConfigValue('socolissimo_username', $value); + ConfigQuery::create()->findOneByValue($value)->delete(); + } + + /** Colissimo password */ + self::setConfigValue('socolissimo_password', ''); + if (null !== $value = ConfigQuery::read('socolissimo_pwd')) { + self::setConfigValue('socolissimo_password', $value); + ConfigQuery::create()->findOneByValue($value)->delete(); + } + + /** Colissimo Google Map key */ + self::setConfigValue('socolissimo_google_map_key', ''); + if (null !== $value = ConfigQuery::read('socolissimo_google_map_key')) { + self::setConfigValue('socolissimo_google_map_key', $value); + ConfigQuery::create()->findOneByValue($value)->delete(); + } + + /** Colissimo Endpoint url for relay point (point relais) */ + self::setConfigValue('socolissimo_endpoint_url', ''); + if (null !== $value = ConfigQuery::read('socolissimo_url_prod')) { + self::setConfigValue('socolissimo_endpoint_url', $value); + ConfigQuery::create()->findOneByValue($value)->delete(); + } + + /** Delete useless config value */ + if (null !== $value = ConfigQuery::read('socolissimo_test_mode')) { + ConfigQuery::create()->findOneByValue($value)->delete(); + } + + /** Delete useless config value */ + if (null !== $value = ConfigQuery::read('socolissimo_url_test')) { + ConfigQuery::create()->findOneByValue($value)->delete(); + } + + self::setConfigValue('socolissimo-rework-2', 1); + } + + /** Shows dom delivery in the config */ + if (!self::getConfigValue('socolissimo_dom_delivery_authorized')) { + self::setConfigValue('socolissimo_dom_delivery_authorized', '0'); + } + } + + public function postActivation(ConnectionInterface $con = null) { try { @@ -364,56 +418,16 @@ public function postActivation(ConnectionInterface $con = null) throw $e; } + $this->checkModuleConfig(); - ConfigQuery::write( - 'socolissimo_login', - ConfigQuery::read('socolissimo_login', null), - 1, - 1 - ); - - ConfigQuery::write( - 'socolissimo_pwd', - ConfigQuery::read('socolissimo_pwd', null), - 1, - 1 - ); - - ConfigQuery::write( - 'socolissimo_pwd', - ConfigQuery::read('socolissimo_pwd', null), - 1, - 1 - ); - - ConfigQuery::write( - 'socolissimo_google_map_key', - ConfigQuery::read('socolissimo_google_map_key', null), - 1, - 1 - ); - - ConfigQuery::write( - 'socolissimo_url_prod', - ConfigQuery::read('socolissimo_url_prod', 'https://ws.colissimo.fr/pointretrait-ws-cxf/PointRetraitServiceWS/2.0?wsdl'), - 1, - 1 - ); - - ConfigQuery::write( - 'socolissimo_url_test', - ConfigQuery::read('socolissimo_url_test', 'https://pfi.telintrans.fr/pointretrait-ws-cxf/PointRetraitServiceWS/2.0?wsdl'), - 1, - 1 - ); - - /* insert the images from image folder if first module activation */ + /** Insert the images from image folder if first module activation */ $module = $this->getModuleModel(); if (ModuleImageQuery::create()->filterByModule($module)->count() == 0) { $this->deployImageFolder($module, sprintf('%s/images', __DIR__), $con); } } + /** Return the module ID */ public static function getModCode() { return ModuleQuery::create()->findOneByCode("SoColissimo")->getId(); @@ -424,6 +438,8 @@ public static function getModCode() */ public function update($currentVersion, $newVersion, ConnectionInterface $con = null) { + $this->checkModuleConfig(); + $finder = (new Finder) ->files() ->name('#.*?\.sql#') diff --git a/WebService/BaseSoColissimoWebService.php b/WebService/BaseSoColissimoWebService.php index f0175dd..4993cba 100755 --- a/WebService/BaseSoColissimoWebService.php +++ b/WebService/BaseSoColissimoWebService.php @@ -23,6 +23,7 @@ namespace SoColissimo\WebService; +use SoColissimo\SoColissimo; use Thelia\Model\ConfigQuery; /** @@ -48,12 +49,8 @@ abstract class BaseSoColissimoWebService extends BaseWebService public function __construct($function) { - $testMode = ConfigQuery::read('socolissimo_test_mode'); - if ($testMode) { - $url = ConfigQuery::read('socolissimo_url_test'); - } else { - $url = ConfigQuery::read('socolissimo_url_prod'); - } + $url = SoColissimo::getConfigValue('socolissimo_endpoint_url'); + parent::__construct($url, $function); } } diff --git a/templates/backOffice/default/SoColissimo/module-config-js.html b/templates/backOffice/default/SoColissimo/module-config-js.html index 2fa6962..1d4e621 100755 --- a/templates/backOffice/default/SoColissimo/module-config-js.html +++ b/templates/backOffice/default/SoColissimo/module-config-js.html @@ -87,9 +87,6 @@ }); - - - // Price slice var tpl = _.template($("#tpl-slice").html()); @@ -200,10 +197,6 @@ }); - - }); - - \ No newline at end of file diff --git a/templates/backOffice/default/SoColissimo/module_configuration.html b/templates/backOffice/default/SoColissimo/module_configuration.html index 3932e27..23eab7b 100755 --- a/templates/backOffice/default/SoColissimo/module_configuration.html +++ b/templates/backOffice/default/SoColissimo/module_configuration.html @@ -1,3 +1,9 @@ +
{loop name="checkrights.socolissimo" type="socolissimo.check.rights"} @@ -219,46 +225,42 @@

{intl l="An error occured"}

{/if} {form_hidden_fields form=$form} - {form_field form=$form field='url_prod'} + {form_field form=$form field='socolissimo_endpoint_url'}
{/form_field} - {form_field form=$form field='url_test'} -
- - -
- {/form_field} - {form_field form=$form field='test_mode'} -
- - - -
- {/form_field} - {form_field form=$form field='accountnumber'} + {form_field form=$form field='socolissimo_username'}
{/form_field} - {form_field form=$form field='password'} + {form_field form=$form field='socolissimo_password'}
{/form_field} - {form_field form=$form field='google_map_key'} + {form_field form=$form field='socolissimo_google_map_key'}
{/form_field} + {form_field form=$form field='socolissimo_dom_delivery_authorized'} +
+ + {intl l='Only use this for compatibility reason or if you have no other choice. For domicile delivery, you should use ColissimoWs instead.' d='socolissimo.bo.default'} + {if $value} + + {else} + + {/if} + +
+ {/form_field}
@@ -398,12 +400,12 @@

{intl l="An error occured"}

- {loop type="auth" name="can_change" role="ADMIN" module="customdelivery" access="UPDATE"} + {loop type="auth" name="can_change" role="ADMIN" module="socolissimo" access="UPDATE"} {/loop} - {loop type="auth" name="can_change" role="ADMIN" module="customdelivery" access="DELETE"} + {loop type="auth" name="can_change" role="ADMIN" module="socolissimo" access="DELETE"}