From f15b96383c3d88637faa81e927c69485036d3326 Mon Sep 17 00:00:00 2001 From: Etienne Roudeix Date: Mon, 16 Sep 2013 10:20:59 +0200 Subject: [PATCH 01/74] cart template --- templates/default/cart.html | 153 ++++++++++++++++++++++++++++++++++++ 1 file changed, 153 insertions(+) create mode 100644 templates/default/cart.html diff --git a/templates/default/cart.html b/templates/default/cart.html new file mode 100644 index 000000000..8ab707f7b --- /dev/null +++ b/templates/default/cart.html @@ -0,0 +1,153 @@ +{extends file="layout.tpl"} + +{block name="breadcrumb"} + +{/block} + +{block name="main-content"} +
+
+ +

Your Cart

+ +
+ 1 Your Cart + 2 Billing and delivery + 3 Check my order + 4 Secure payment +
+ +
+ + + + + + + + + + + + + + + + + + + + {loop type="cart" name="cartloop"} + + + + + + + + + + {/loop} + + + + + + + + + +
  + + Name + + + Price + + + Qty + + + Total +
+ + {assign "cart_count" $LOOP_COUNT} + {ifloop rel='product-image'} + {loop type="image" name="product-image" product=$PRODUCT_ID limit="1" width="118" height="85" force_return="true"} + Product #{$cart_count} + {/loop} + {/ifloop} + {elseloop rel="product-image"} + {images file='assets/img/product/1/118x85.png'}Product #{$LOOP_COUNT}{/images} + {/elseloop} + +

+ Product #{$LOOP_COUNT} +

+
+
+
Available :
+
In Stock
+
No.
+
{$REF}
+ {*
Select Size
+
Large
+
Select Delivery Date
+
Jan 2, 2013
+
Additional Option
+
Option 1
*} +
+
+ Remove + 		+
$50.00
+ instead of $59.99 + 		+
+ +
+ 		+ $100.00 +
 Total TTC +
+ $200.00 +
+
+ + Continue Shopping + +
+ +
+ + + +
+ + +{/block} \ No newline at end of file From b6bc6994fc007254bd8a9b64456a24471244303e Mon Sep 17 00:00:00 2001 From: gmorel Date: Mon, 16 Sep 2013 10:53:15 +0200 Subject: [PATCH 02/74] WIP : Install wizard --- .../Controller/Install/InstallController.php | 3 ++- core/lib/Thelia/Install/CheckPermission.php | 25 ++++++++++--------- 2 files changed, 15 insertions(+), 13 deletions(-) diff --git a/core/lib/Thelia/Controller/Install/InstallController.php b/core/lib/Thelia/Controller/Install/InstallController.php index 40e6643db..75594868a 100644 --- a/core/lib/Thelia/Controller/Install/InstallController.php +++ b/core/lib/Thelia/Controller/Install/InstallController.php @@ -42,9 +42,10 @@ class InstallController extends BaseInstallController public function checkPermission() { + var_dump('step2'); //$this->verifyStep(2); - //$permission = new CheckPermission(); + $permission = new CheckPermission(); $this->getSession()->set("step", 2); return $this->render("step-2.html"); diff --git a/core/lib/Thelia/Install/CheckPermission.php b/core/lib/Thelia/Install/CheckPermission.php index db73330cf..e57185c36 100644 --- a/core/lib/Thelia/Install/CheckPermission.php +++ b/core/lib/Thelia/Install/CheckPermission.php @@ -31,9 +31,10 @@ namespace Thelia\Install; */ class CheckPermission extends BaseInstall { - const CONF = "const"; - const LOG = "log"; - const CACHE = "cache"; + + const DIR_CONF = 'local/config'; + const DIR_LOG = 'log'; + const DIR_CACHE = 'cache'; private $directories = array(); private $validation = array(); @@ -44,22 +45,22 @@ class CheckPermission extends BaseInstall $this->directories = array( - self::CONF => THELIA_ROOT . "local/config", - self::LOG => THELIA_ROOT . "log", - self::CACHE => THELIA_ROOT . "cache" + self::DIR_CONF => THELIA_ROOT . 'local/config', + self::DIR_LOG => THELIA_ROOT . 'DIR_LOG', + self::DIR_CACHE => THELIA_ROOT . 'DIR_CACHE' ); $this->validation = array( - self::CONF => array( - "text" => sprintf("config directory(%s)...", $this->directories[self::CONF]), + self::DIR_CONF => array( + "text" => sprintf("config directory(%s)...", $this->directories[self::DIR_CONF]), "status" => true ), - self::LOG => array( - "text" => sprintf("cache directory(%s)...", $this->directories[self::LOG]), + self::DIR_LOG => array( + "text" => sprintf("DIR_CACHE directory(%s)...", $this->directories[self::DIR_LOG]), "status" => true ), - self::CACHE => array( - "text" => sprintf("log directory(%s)...", $this->directories[self::CACHE]), + self::DIR_CACHE => array( + "text" => sprintf("DIR_LOG directory(%s)...", $this->directories[self::DIR_CACHE]), "status" => true ) ); From 2857d0621c468820e2e05fb8bfdcacd3861bf2c7 Mon Sep 17 00:00:00 2001 From: Etienne Roudeix Date: Mon, 16 Sep 2013 11:14:23 +0200 Subject: [PATCH 03/74] cart page --- core/lib/Thelia/Core/Template/Loop/Cart.php | 12 +++++++++++- core/lib/Thelia/Model/CartItem.php | 12 ++++++++++++ core/lib/Thelia/Model/Product.php | 2 +- core/lib/Thelia/Model/ProductSaleElements.php | 4 ++-- templates/default/cart.html | 16 +++++++++++----- templates/default/product.html | 4 ++-- 6 files changed, 39 insertions(+), 11 deletions(-) diff --git a/core/lib/Thelia/Core/Template/Loop/Cart.php b/core/lib/Thelia/Core/Template/Loop/Cart.php index f65afdf40..17437387e 100755 --- a/core/lib/Thelia/Core/Template/Loop/Cart.php +++ b/core/lib/Thelia/Core/Template/Loop/Cart.php @@ -13,6 +13,7 @@ use Thelia\Core\Template\Element\BaseLoop; use Thelia\Core\Template\Element\LoopResult; use Thelia\Core\Template\Element\LoopResultRow; use Thelia\Core\Template\Loop\Argument\ArgumentCollection; +use Thelia\Model\CountryQuery; class Cart extends BaseLoop { @@ -82,7 +83,6 @@ class Cart extends BaseLoop foreach ($cartItems as $cartItem) { $product = $cartItem->getProduct(); - //$product->setLocale($this->request->getSession()->getLocale()); $loopResultRow = new LoopResultRow($result, $cartItem, $this->versionable, $this->timestampable, $this->countable); @@ -92,6 +92,16 @@ class Cart extends BaseLoop $loopResultRow->set("QUANTITY", $cartItem->getQuantity()); $loopResultRow->set("PRICE", $cartItem->getPrice()); $loopResultRow->set("PRODUCT_ID", $product->getId()); + $loopResultRow->set("PRODUCT_URL", $product->getUrl($this->request->getSession()->getLang()->getLocale())) + ->set("PRICE", $cartItem->getPrice()) + ->set("PROMO_PRICE", $cartItem->getPromoPrice()) + ->set("TAXED_PRICE", $cartItem->getTaxedPrice( + CountryQuery::create()->findOneById(64) // @TODO : make it magic + )) + ->set("PROMO_TAXED_PRICE", $cartItem->getTaxedPromoPrice( + CountryQuery::create()->findOneById(64) // @TODO : make it magic + )) + ->set("IS_PROMO", $cartItem->getPromo() === 1 ? 1 : 0); $result->addRow($loopResultRow); } diff --git a/core/lib/Thelia/Model/CartItem.php b/core/lib/Thelia/Model/CartItem.php index 5ef6048a5..f6a34011d 100755 --- a/core/lib/Thelia/Model/CartItem.php +++ b/core/lib/Thelia/Model/CartItem.php @@ -8,6 +8,7 @@ use Thelia\Core\Event\TheliaEvents; use Thelia\Model\Base\CartItem as BaseCartItem; use Thelia\Model\ConfigQuery; use Thelia\Core\Event\CartEvent; +use Thelia\TaxEngine\Calculator; class CartItem extends BaseCartItem { @@ -64,4 +65,15 @@ class CartItem extends BaseCartItem return $this; } + public function getTaxedPrice(Country $country) + { + $taxCalculator = new Calculator(); + return round($taxCalculator->load($this->getProduct(), $country)->getTaxedPrice($this->getPrice()), 2); + } + + public function getTaxedPromoPrice(Country $country) + { + $taxCalculator = new Calculator(); + return round($taxCalculator->load($this->getProduct(), $country)->getTaxedPrice($this->getPromoPrice()), 2); + } } diff --git a/core/lib/Thelia/Model/Product.php b/core/lib/Thelia/Model/Product.php index 06c4640d0..28951fb44 100755 --- a/core/lib/Thelia/Model/Product.php +++ b/core/lib/Thelia/Model/Product.php @@ -28,6 +28,6 @@ class Product extends BaseProduct public function getTaxedPrice(Country $country) { $taxCalculator = new Calculator(); - return $taxCalculator->load($this, $country)->getTaxedPrice($this->getRealLowestPrice()); + return round($taxCalculator->load($this, $country)->getTaxedPrice($this->getRealLowestPrice()), 2); } } diff --git a/core/lib/Thelia/Model/ProductSaleElements.php b/core/lib/Thelia/Model/ProductSaleElements.php index 184e37d0a..6a95c37f3 100755 --- a/core/lib/Thelia/Model/ProductSaleElements.php +++ b/core/lib/Thelia/Model/ProductSaleElements.php @@ -32,12 +32,12 @@ class ProductSaleElements extends BaseProductSaleElements public function getTaxedPrice(Country $country) { $taxCalculator = new Calculator(); - return $taxCalculator->load($this->getProduct(), $country)->getTaxedPrice($this->getPrice()); + return round($taxCalculator->load($this->getProduct(), $country)->getTaxedPrice($this->getPrice()), 2); } public function getTaxedPromoPrice(Country $country) { $taxCalculator = new Calculator(); - return $taxCalculator->load($this->getProduct(), $country)->getTaxedPrice($this->getPromoPrice()); + return round($taxCalculator->load($this->getProduct(), $country)->getTaxedPrice($this->getPromoPrice()), 2); } } diff --git a/templates/default/cart.html b/templates/default/cart.html index 8ab707f7b..e3107b34e 100644 --- a/templates/default/cart.html +++ b/templates/default/cart.html @@ -88,11 +88,17 @@
Option 1
*} - Remove + Remove -
$50.00
- instead of $59.99 + {if $IS_PROMO == 1} + {assign "real_price" $PROMO_TAXED_PRICE} +
{currency attr="symbol"} {$PROMO_TAXED_PRICE}
+ instead of {currency attr="symbol"} {$TAXED_PRICE} + {else} + {assign "real_price" $TAXED_PRICE} +
{currency attr="symbol"} {$TAXED_PRICE}
+ {/if}
@@ -100,7 +106,7 @@
- $100.00 + {currency attr="symbol"} {$real_price * $QUANTITY} @@ -120,7 +126,7 @@ - Continue Shopping + Continue Shopping diff --git a/templates/default/product.html b/templates/default/product.html index 7c62eb740..f2b58d4ba 100644 --- a/templates/default/product.html +++ b/templates/default/product.html @@ -94,13 +94,13 @@ online_only : http://schema.org/OnlineOnly --> {if $IS_PROMO } - {loop name="productSaleElements_promo" type="product_sale_elements" product="{$ID}" limit="1"} + {loop name="productSaleElements_promo" type="product_sale_elements" product="{$ID}" limit="1" order="min_price"} {assign var="default_product_sale_elements" value="$ID"} {intl l="Special Price:"} {format_number number="{$TAXED_PROMO_PRICE}"} {currency attr="symbol"} {intl l="Regular Price:"} {format_number number="{$TAXED_PRICE}"} {currency attr="symbol"} {/loop} {else} - {intl l="Special Price:"} {format_number number="{$BEST_TAXED_PRICE}"} {currency attr="symbol"} + {intl l="Special Price:"} {format_number number="{$TAXED_PRICE}"} {currency attr="symbol"} {/if} From e0a48df23eb860d38a477df68e0967627106ec9e Mon Sep 17 00:00:00 2001 From: Etienne Roudeix Date: Mon, 16 Sep 2013 13:15:35 +0200 Subject: [PATCH 04/74] cart integration --- .../Thelia/Config/Resources/routing/front.xml | 6 + core/lib/Thelia/Core/Template/Loop/Cart.php | 2 + .../Smarty/Plugins/DataAccessFunctions.php | 10 +- core/lib/Thelia/Model/Cart.php | 25 +- core/lib/Thelia/Model/CartItem.php | 5 + templates/default/cart.html | 221 ++++++++++-------- templates/default/cart_billing.html | 141 +++++++++++ 7 files changed, 304 insertions(+), 106 deletions(-) create mode 100644 templates/default/cart_billing.html diff --git a/core/lib/Thelia/Config/Resources/routing/front.xml b/core/lib/Thelia/Config/Resources/routing/front.xml index adbb7d529..cea964153 100755 --- a/core/lib/Thelia/Config/Resources/routing/front.xml +++ b/core/lib/Thelia/Config/Resources/routing/front.xml @@ -97,6 +97,12 @@ Thelia\Controller\Front\DefaultController::noAction cart + + + Thelia\Controller\Front\DefaultController::noAction + cart_billing + + Thelia\Controller\Front\CartController::addItem diff --git a/core/lib/Thelia/Core/Template/Loop/Cart.php b/core/lib/Thelia/Core/Template/Loop/Cart.php index 17437387e..3c8724d68 100755 --- a/core/lib/Thelia/Core/Template/Loop/Cart.php +++ b/core/lib/Thelia/Core/Template/Loop/Cart.php @@ -83,6 +83,7 @@ class Cart extends BaseLoop foreach ($cartItems as $cartItem) { $product = $cartItem->getProduct(); + $productSaleElement = $cartItem->getProductSaleElements(); $loopResultRow = new LoopResultRow($result, $cartItem, $this->versionable, $this->timestampable, $this->countable); @@ -93,6 +94,7 @@ class Cart extends BaseLoop $loopResultRow->set("PRICE", $cartItem->getPrice()); $loopResultRow->set("PRODUCT_ID", $product->getId()); $loopResultRow->set("PRODUCT_URL", $product->getUrl($this->request->getSession()->getLang()->getLocale())) + ->set("STOCK", $productSaleElement->getQuantity()) ->set("PRICE", $cartItem->getPrice()) ->set("PROMO_PRICE", $cartItem->getPromoPrice()) ->set("TAXED_PRICE", $cartItem->getTaxedPrice( diff --git a/core/lib/Thelia/Core/Template/Smarty/Plugins/DataAccessFunctions.php b/core/lib/Thelia/Core/Template/Smarty/Plugins/DataAccessFunctions.php index 802dfcff2..cc99bfe50 100755 --- a/core/lib/Thelia/Core/Template/Smarty/Plugins/DataAccessFunctions.php +++ b/core/lib/Thelia/Core/Template/Smarty/Plugins/DataAccessFunctions.php @@ -31,6 +31,7 @@ use Thelia\Core\Template\ParserContext; use Thelia\Core\Template\Smarty\SmartyPluginDescriptor; use Thelia\Model\CategoryQuery; use Thelia\Model\ContentQuery; +use Thelia\Model\CountryQuery; use Thelia\Model\CurrencyQuery; use Thelia\Model\FolderQuery; use Thelia\Model\Product; @@ -160,9 +161,16 @@ class DataAccessFunctions extends AbstractSmartyPlugin $result = ""; switch($params["attr"]) { case "count_item": - $result = $cart->getCartItems()->count(); break; + case "total_price": + $result = $cart->getTotalAmount(); + break; + case "total_taxed_price": + $result = $cart->getTaxedAmount( + CountryQuery::create()->findOneById(64) // @TODO : make it magic + ); + break; } return $result; diff --git a/core/lib/Thelia/Model/Cart.php b/core/lib/Thelia/Model/Cart.php index dcb65f88e..78e19daa4 100755 --- a/core/lib/Thelia/Model/Cart.php +++ b/core/lib/Thelia/Model/Cart.php @@ -8,6 +8,7 @@ use Thelia\Model\Base\Cart as BaseCart; use Thelia\Model\ProductSaleElementsQuery; use Thelia\Model\ProductPriceQuery; use Thelia\Model\CartItemQuery; +use Thelia\TaxEngine\Calculator; class Cart extends BaseCart { @@ -72,9 +73,25 @@ class Cart extends BaseCart ; } - public function getTaxedAmount() + public function getTaxedAmount(Country $country) { + $taxCalculator = new Calculator(); + $total = 0; + + foreach($this->getCartItems() as $cartItem) { + $subtotal = $cartItem->getRealPrice(); + $subtotal -= $cartItem->getDiscount(); + /* we round it for the unit price, before the quantity factor */ + $subtotal = round($taxCalculator->load($cartItem->getProduct(), $country)->getTaxedPrice($subtotal), 2); + $subtotal *= $cartItem->getQuantity(); + + $total += $subtotal; + } + + $total -= $this->getDiscount(); + + return $total; } public function getTotalAmount() @@ -82,7 +99,11 @@ class Cart extends BaseCart $total = 0; foreach($this->getCartItems() as $cartItem) { - $total += $cartItem->getPrice()-$cartItem->getDiscount(); + $subtotal = $cartItem->getRealPrice(); + $subtotal -= $cartItem->getDiscount(); + $subtotal *= $cartItem->getQuantity(); + + $total += $subtotal; } $total -= $this->getDiscount(); diff --git a/core/lib/Thelia/Model/CartItem.php b/core/lib/Thelia/Model/CartItem.php index f6a34011d..a1fb3601a 100755 --- a/core/lib/Thelia/Model/CartItem.php +++ b/core/lib/Thelia/Model/CartItem.php @@ -65,6 +65,11 @@ class CartItem extends BaseCartItem return $this; } + public function getRealPrice() + { + return $this->getPromo() == 1 ? $this->getPromoPrice() : $this->getPrice(); + } + public function getTaxedPrice(Country $country) { $taxCalculator = new Calculator(); diff --git a/templates/default/cart.html b/templates/default/cart.html index e3107b34e..6f91d8581 100644 --- a/templates/default/cart.html +++ b/templates/default/cart.html @@ -4,7 +4,7 @@ @@ -23,112 +23,117 @@ 4 Secure payment -
- - - - - - - - - - - - - - - - - - +
  - - Name - - - Price - - - Qty - - - Total -
+ + + + + + + + + + + + + + + + + - {loop type="cart" name="cartloop"} + {loop type="cart" name="cartloop"} - - - - - - - + + + + + + + - {/loop} + {/loop} - - - - - - - - -
  + + Name + + + Price + + + Qty + + + Total +
- - {assign "cart_count" $LOOP_COUNT} - {ifloop rel='product-image'} - {loop type="image" name="product-image" product=$PRODUCT_ID limit="1" width="118" height="85" force_return="true"} - Product #{$cart_count} - {/loop} - {/ifloop} - {elseloop rel="product-image"} - {images file='assets/img/product/1/118x85.png'}Product #{$LOOP_COUNT}{/images} - {/elseloop} - -

- Product #{$LOOP_COUNT} -

-
-
-
Available :
-
In Stock
-
No.
-
{$REF}
- {*
Select Size
-
Large
-
Select Delivery Date
-
Jan 2, 2013
-
Additional Option
-
Option 1
*} -
-
- Remove - 		- {if $IS_PROMO == 1} - {assign "real_price" $PROMO_TAXED_PRICE} -
{currency attr="symbol"} {$PROMO_TAXED_PRICE}
- instead of {currency attr="symbol"} {$TAXED_PRICE} - {else} - {assign "real_price" $TAXED_PRICE} -
{currency attr="symbol"} {$TAXED_PRICE}
- {/if} - 		-
- -
- 		- {currency attr="symbol"} {$real_price * $QUANTITY} -
+ + {assign "cart_count" $LOOP_COUNT} + {ifloop rel='product-image'} + {loop type="image" name="product-image" product=$PRODUCT_ID limit="1" width="118" height="85" force_return="true"} + Product #{$cart_count} + {/loop} + {/ifloop} + {elseloop rel="product-image"} + {images file='assets/img/product/1/118x85.png'}Product #{$cart_count}{/images} + {/elseloop} + +

+ Product #{$LOOP_COUNT} +

+
+
+
Available :
+
In Stock
+
No.
+
{$REF}
+ {*
Select Size
+
Large
+
Select Delivery Date
+
Jan 2, 2013
+
Additional Option
+
Option 1
*} +
+
+ Remove + 		+ {if $IS_PROMO == 1} + {assign "real_price" $PROMO_TAXED_PRICE} +
{currency attr="symbol"} {$PROMO_TAXED_PRICE}
+ instead of {currency attr="symbol"} {$TAXED_PRICE} + {else} + {assign "real_price" $TAXED_PRICE} +
{currency attr="symbol"} {$TAXED_PRICE}
+ {/if} + 		+
+ + + + +
+ 		+ {currency attr="symbol"} {$real_price * $QUANTITY} +
 Total TTC -
- $200.00 -
-
+ + + +   + Total TTC + +
+ {currency attr="symbol"} {cart attr="total_taxed_price"} +
+ + + + - Continue Shopping - - + Continue Shopping + Proceed checkout @@ -154,6 +159,16 @@ +{/block} - +{block name="javascript-initialization"} + {/block} \ No newline at end of file diff --git a/templates/default/cart_billing.html b/templates/default/cart_billing.html new file mode 100644 index 000000000..d44753e48 --- /dev/null +++ b/templates/default/cart_billing.html @@ -0,0 +1,141 @@ +{extends file="layout.tpl"} + +{block name="breadcrumb"} + +{/block} + +{block name="main-content"} +
+
+ +

Your Cart

+ +
+ 1 Your Cart + 2 Billing and delivery + 3 Check my order + 4 Secure payment +
+ +
+
+
+ Add a new address + Chose your delivery address +
+
+ + + + {loop type="address" name="customer.addresses" customer="current"} + + + + + + + + {/loop} + + + +
+
+ +
+
Choose your delivery method
+
+
+ +
+
+ +
+
+
+ + Back + + +
+
+
+ + + +{/block} + +{block name="javascript-initialization"} + +{/block} \ No newline at end of file From c7b3aea7f08f6a0442ce0b0a8686e043e3121932 Mon Sep 17 00:00:00 2001 From: Etienne Roudeix Date: Mon, 16 Sep 2013 14:31:34 +0200 Subject: [PATCH 05/74] cart integration --- core/lib/Thelia/Core/Template/Element/LoopResult.php | 2 +- core/lib/Thelia/Core/Template/Loop/Feed.php | 11 ++++++++--- core/lib/Thelia/Module/DeliveryModuleInterface.php | 7 +++++-- local/modules/Colissimo/Colissimo.php | 5 +++-- 4 files changed, 17 insertions(+), 8 deletions(-) diff --git a/core/lib/Thelia/Core/Template/Element/LoopResult.php b/core/lib/Thelia/Core/Template/Element/LoopResult.php index f86ab203d..45b690fc0 100755 --- a/core/lib/Thelia/Core/Template/Element/LoopResult.php +++ b/core/lib/Thelia/Core/Template/Element/LoopResult.php @@ -37,7 +37,7 @@ class LoopResult implements \Iterator public function __construct($modelCollection = null) { $this->position = 0; - if ($modelCollection instanceof ObjectCollection || $modelCollection instanceof PropelModelPager) { + if ($modelCollection instanceof ObjectCollection || $modelCollection instanceof PropelModelPager || is_array($modelCollection)) { $this->modelCollection = $modelCollection; } } diff --git a/core/lib/Thelia/Core/Template/Loop/Feed.php b/core/lib/Thelia/Core/Template/Loop/Feed.php index 8e155a666..a40f84647 100755 --- a/core/lib/Thelia/Core/Template/Loop/Feed.php +++ b/core/lib/Thelia/Core/Template/Loop/Feed.php @@ -73,9 +73,14 @@ class Feed extends BaseLoop $limit = min(count($items), $this->getLimit()); - $loopResult = new LoopResult(); - + $indexes = array(); for ($idx = 0; $idx < $limit; $idx++) { + $indexes[] = $idx; + } + + $loopResult = new LoopResult($query); + + foreach ($indexes as $idx) { $item = $items[$idx]; @@ -87,7 +92,7 @@ class Feed extends BaseLoop $date = $item->get_date('d/m/Y'); - $loopResultRow = new LoopResultRow(); + $loopResultRow = new LoopResultRow($loopResult, $item, $this->versionable, $this->timestampable, $this->countable); $loopResultRow->set("URL", $item->get_permalink()); $loopResultRow->set("TITLE", $item->get_title()); diff --git a/core/lib/Thelia/Module/DeliveryModuleInterface.php b/core/lib/Thelia/Module/DeliveryModuleInterface.php index ba218ac4d..72f8769bc 100644 --- a/core/lib/Thelia/Module/DeliveryModuleInterface.php +++ b/core/lib/Thelia/Module/DeliveryModuleInterface.php @@ -23,13 +23,16 @@ namespace Thelia\Module; +use Thelia\Model\Country; + interface DeliveryModuleInterface extends BaseModuleInterface { /** - * * calculate and return delivery price * + * @param Country $country + * * @return mixed */ - public function calculate($country = null); + public function calculate(Country $country); } diff --git a/local/modules/Colissimo/Colissimo.php b/local/modules/Colissimo/Colissimo.php index 4d24cc059..2fe9cd0b9 100644 --- a/local/modules/Colissimo/Colissimo.php +++ b/local/modules/Colissimo/Colissimo.php @@ -25,6 +25,7 @@ namespace Colissimo; use Symfony\Component\EventDispatcher\EventDispatcherInterface; use Symfony\Component\HttpFoundation\Request; +use Thelia\Model\Country; use Thelia\Module\BaseModule; use Thelia\Module\DeliveryModuleInterface; @@ -57,10 +58,10 @@ class Colissimo extends BaseModule implements DeliveryModuleInterface * * calculate and return delivery price * - * @param null $country + * @param Country $country * @return mixed */ - public function calculate($country = null) + public function calculate(Country $country) { // TODO: Implement calculate() method. return 2; From b151325e572c9c23a1940e9565462c2abe29ee6f Mon Sep 17 00:00:00 2001 From: gmorel Date: Mon, 16 Sep 2013 15:07:41 +0200 Subject: [PATCH 06/74] WIP : Install wizard : step 2 file permission --- .../Controller/Install/InstallController.php | 70 ++++++- core/lib/Thelia/Install/BaseInstall.php | 15 +- core/lib/Thelia/Install/CheckPermission.php | 183 ++++++++++++++---- templates/install/layout.tpl | 1 - templates/install/step-2.html | 15 +- 5 files changed, 232 insertions(+), 52 deletions(-) diff --git a/core/lib/Thelia/Controller/Install/InstallController.php b/core/lib/Thelia/Controller/Install/InstallController.php index 75594868a..648ae843e 100644 --- a/core/lib/Thelia/Controller/Install/InstallController.php +++ b/core/lib/Thelia/Controller/Install/InstallController.php @@ -26,12 +26,14 @@ use Thelia\Install\CheckPermission; /** * Class InstallController + * * @package Thelia\Controller\Install - * @author Manuel Raynaud + * @author Manuel Raynaud + * @author Guillaume MOREL */ class InstallController extends BaseInstallController { - public function index() + public function indexAction() { //$this->verifyStep(1); @@ -40,57 +42,109 @@ class InstallController extends BaseInstallController return $this->render("index.html"); } - public function checkPermission() + /** + * Integration tests + * + * @return \Symfony\Component\HttpFoundation\Response + */ + public function checkPermissionAction() { + $args = array(); var_dump('step2'); //$this->verifyStep(2); - $permission = new CheckPermission(); + $checkPermission = new CheckPermission(true, $this->getTranslator()); + $args['isValid'] = $isValid = $checkPermission->exec(); + $args['validationMessages'] = $checkPermission->getValidationMessages(); $this->getSession()->set("step", 2); - return $this->render("step-2.html"); + + return $this->render("step-2.html", $args); } + /** + * Database connexion tests + * + * @return \Symfony\Component\HttpFoundation\Response + */ public function databaseConnection() { + var_dump('step 3 bis'); + } + + /** + * Database connexion tests + * + * @return \Symfony\Component\HttpFoundation\Response + */ + public function databaseConnectionAction() + { + var_dump('step 3'); + exit(); //$this->verifyStep(2); //$permission = new CheckPermission(); $this->getSession()->set("step", 3); + return $this->render("step-3.html"); } - public function databaseSelection() + /** + * Database selection + * + * @return \Symfony\Component\HttpFoundation\Response + */ + public function databaseSelectionAction() { //$this->verifyStep(2); //$permission = new CheckPermission(); $this->getSession()->set("step", 4); + return $this->render("step-4.html"); } - public function generalInformation() + /** + * Set general informations + * + * @return \Symfony\Component\HttpFoundation\Response + */ + public function generalInformationAction() { //$this->verifyStep(2); //$permission = new CheckPermission(); $this->getSession()->set("step", 5); + return $this->render("step-5.html"); } - public function thanks() + /** + * Display Thanks page + * + * @return \Symfony\Component\HttpFoundation\Response + */ + public function thanksAction() { //$this->verifyStep(2); //$permission = new CheckPermission(); $this->getSession()->set("step", 6); + return $this->render("thanks.html"); } + /** + * Verify each steps and redirect if one step has already been passed + * + * @param int $step Step number + * + * @return bool + */ protected function verifyStep($step) { $session = $this->getSession(); diff --git a/core/lib/Thelia/Install/BaseInstall.php b/core/lib/Thelia/Install/BaseInstall.php index 11b8d0999..86928236a 100644 --- a/core/lib/Thelia/Install/BaseInstall.php +++ b/core/lib/Thelia/Install/BaseInstall.php @@ -25,15 +25,28 @@ use Thelia\Install\Exception\AlreadyInstallException; /** * Class BaseInstall + * * @author Manuel Raynaud */ abstract class BaseInstall { + /** @var bool If Installation wizard is launched by CLI */ + protected $isConsoleMode = true; + /** - * Verify if an installation already exists + * Constructor + * + * @param bool $verifyInstall Verify if an installation already exists */ public function __construct($verifyInstall = true) { + + // Check if install wizard is launched via CLI + if (php_sapi_name() == 'cli') { + $this->isConsoleMode = true; + } else { + $this->isConsoleMode = false; + } /* TODO : activate this part if (file_exists(THELIA_ROOT . '/local/config/database.yml') && $verifyInstall) { throw new AlreadyInstallException("Thelia is already installed"); diff --git a/core/lib/Thelia/Install/CheckPermission.php b/core/lib/Thelia/Install/CheckPermission.php index e57185c36..d924bac35 100644 --- a/core/lib/Thelia/Install/CheckPermission.php +++ b/core/lib/Thelia/Install/CheckPermission.php @@ -23,57 +23,172 @@ namespace Thelia\Install; +use RecursiveDirectoryIterator; +use RecursiveIteratorIterator; +use Symfony\Component\Translation\TranslatorInterface; +use Thelia\Core\Translation\Translator; + /** * Class CheckPermission + * + * Take care of integration tests (files permissions) + * * @package Thelia\Install - * @author Manuel Raynaud + * @author Manuel Raynaud + * @author Guillaume MOREL */ class CheckPermission extends BaseInstall { - const DIR_CONF = 'local/config'; - const DIR_LOG = 'log'; - const DIR_CACHE = 'cache'; + const DIR_CONF = 'local/config'; + const DIR_LOG = 'log'; + const DIR_CACHE = 'cache'; - private $directories = array(); - private $validation = array(); - private $valid = true; + /** @var array Directory needed to be writable */ + protected $directoriesToBeWritable = array( + self::DIR_CONF, + self::DIR_LOG, + self::DIR_CACHE, + ); - public function __construct($verifyInstall = true) + protected $validationMessages = array(); + + /** @var bool If permissions are OK */ + protected $isValid = true; + + /** @var TranslatorInterface Translator Service */ + protected $translator = null; + + /** + * Constructor + * + * @param bool $verifyInstall If verify install + * @param Translator $translator Translator Service + * necessary for install wizard + */ + public function __construct($verifyInstall = true, Translator $translator = null) { + $this->translator = $translator; - - $this->directories = array( - self::DIR_CONF => THELIA_ROOT . 'local/config', - self::DIR_LOG => THELIA_ROOT . 'DIR_LOG', - self::DIR_CACHE => THELIA_ROOT . 'DIR_CACHE' - ); - - $this->validation = array( - self::DIR_CONF => array( - "text" => sprintf("config directory(%s)...", $this->directories[self::DIR_CONF]), - "status" => true - ), - self::DIR_LOG => array( - "text" => sprintf("DIR_CACHE directory(%s)...", $this->directories[self::DIR_LOG]), - "status" => true - ), - self::DIR_CACHE => array( - "text" => sprintf("DIR_LOG directory(%s)...", $this->directories[self::DIR_CACHE]), - "status" => true - ) - ); + foreach ($this->directoriesToBeWritable as $directory) { + $this->validationMessages[$directory] = array( + 'text' => '', + 'hint' => '', + 'status' => true + ); + } parent::__construct($verifyInstall); } + /** + * Perform file permission check + * + * @return bool + */ public function exec() { - foreach ($this->directories as $key => $directory) { - if(is_writable($directory) === false) { - $this->valid = false; - $this->validation[$key]["status"] = false; + foreach ($this->directoriesToBeWritable as $directory) { + $fullDirectory = THELIA_ROOT . $directory; + $this->validationMessages[$directory]['text'] = $this->getI18nText($fullDirectory, true); + if (is_writable($fullDirectory) === false) { + if (!$this->makeDirectoryWritable($fullDirectory)) { + $this->isValid = false; + $this->validationMessages[$directory]['status'] = false; + $this->validationMessages[$directory]['text'] = $this->getI18nText($fullDirectory, false); + $this->validationMessages[$directory]['hint'] = $this->getI18nHint($fullDirectory); + } } } + + return $this->isValid; } -} \ No newline at end of file + + /** + * Get validation messages + * + * @return array + */ + public function getValidationMessages() + { + return $this->validationMessages; + } + + /** + * Make a directory writable (recursively) + * + * @param string $directory path to directory + * + * @return bool + */ + protected function makeDirectoryWritable($directory) + { + chmod($directory, 0777); + $iterator = new RecursiveIteratorIterator( + new RecursiveDirectoryIterator($directory) + ); + foreach ($iterator as $item) { + chmod($item, 0777); + } + + return (is_writable(THELIA_ROOT . $directory) === true); + } + + + + /** + * Get Translated text about the directory state + * + * @param string $directory Directory being checked + * @param bool $isValid If directory permission is valid + * + * @return string + */ + protected function getI18nText($directory, $isValid) + { + if ($this->translator !== null) { + if ($isValid) { + $sentence = 'Your directory %directory% is writable'; + } else { + $sentence = 'Your directory %directory% is not writable'; + } + + $translatedText = $this->translator->trans( + $sentence, + array( + '%directory%' => $directory + ), + 'install-wizard' + ); + } else { + $translatedText = sprintf('Your directory %s needs to be writable', $directory); + } + + return $translatedText; + } + + /** + * Get Translated hint about the directory state + * + * @param string $directory Directory being checked + * + * @return string + */ + protected function getI18nHint($directory) + { + if ($this->translator !== null) { + $sentence = 'chmod 777 %directory% on your server with admin rights could help'; + $translatedText = $this->translator->trans( + $sentence, + array( + '%directory%' => $directory + ), + 'install-wizard' + ); + } else { + $translatedText = sprintf('chmod 777 %s on your server with admin rights could help', $directory); + } + + return $translatedText; + } +} diff --git a/templates/install/layout.tpl b/templates/install/layout.tpl index 4539ce32f..6b38292e2 100644 --- a/templates/install/layout.tpl +++ b/templates/install/layout.tpl @@ -38,7 +38,6 @@ - {intl l='Édité par OpenStudio'} - {intl l='Forum Thelia'} - {intl l='Contributions Thelia'} - {intl l='interface par Steaw-Webdesign'}

{module_include location='in_footer'} diff --git a/templates/install/step-2.html b/templates/install/step-2.html index fc24d25cb..a05267c7c 100644 --- a/templates/install/step-2.html +++ b/templates/install/step-2.html @@ -24,15 +24,14 @@
-

We will check some rights to files and directories...

+

{intl l="Checking directory permissions ..."}

    -
  • Duis mollis, est non commodo luctus, nisi erat porttitor ligula.
    • -
  • Duis mollis, est non commodo luctus, nisi erat porttitor ligula.
    • -
  • Duis mollis, est non commodo luctus, nisi erat porttitor ligula.
    • -
  • Duis mollis, est non commodo luctus, nisi erat porttitor ligula.
    • -
  • Duis mollis, est non commodo luctus, nisi erat porttitor ligula.
    • -
  • Duis mollis, est non commodo luctus, nisi erat porttitor ligula.
    • -
  • Duis mollis, est non commodo luctus, nisi erat porttitor ligula.
    • + {foreach from=$validationMessages item=validationMessage} +
  • + {$validationMessage.text nofilter} + {if !$validationMessage.status} - {$validationMessage.hint nofilter}{/if} +
    • + {/foreach}
From bca2b58e416c9fb1d01aa55f9165d7f3151657bb Mon Sep 17 00:00:00 2001 From: gmorel Date: Mon, 16 Sep 2013 15:07:58 +0200 Subject: [PATCH 07/74] Merge master --- local/modules/Colissimo/Colissimo.php | 0 local/modules/Colissimo/Config/config.xml | 0 local/modules/Colissimo/Config/plugin.xml | 0 local/modules/Colissimo/Config/schema.xml | 0 local/modules/DebugBar/Config/config.xml | 0 local/modules/DebugBar/Config/plugin.xml | 0 local/modules/DebugBar/Config/schema.xml | 0 local/modules/DebugBar/DataCollector/PropelCollector.php | 0 local/modules/DebugBar/DebugBar.php | 0 local/modules/DebugBar/Listeners/DebugBarListeners.php | 0 local/modules/DebugBar/Smarty/Plugin/DebugBar.php | 0 11 files changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 local/modules/Colissimo/Colissimo.php mode change 100644 => 100755 local/modules/Colissimo/Config/config.xml mode change 100644 => 100755 local/modules/Colissimo/Config/plugin.xml mode change 100644 => 100755 local/modules/Colissimo/Config/schema.xml mode change 100644 => 100755 local/modules/DebugBar/Config/config.xml mode change 100644 => 100755 local/modules/DebugBar/Config/plugin.xml mode change 100644 => 100755 local/modules/DebugBar/Config/schema.xml mode change 100644 => 100755 local/modules/DebugBar/DataCollector/PropelCollector.php mode change 100644 => 100755 local/modules/DebugBar/DebugBar.php mode change 100644 => 100755 local/modules/DebugBar/Listeners/DebugBarListeners.php mode change 100644 => 100755 local/modules/DebugBar/Smarty/Plugin/DebugBar.php diff --git a/local/modules/Colissimo/Colissimo.php b/local/modules/Colissimo/Colissimo.php old mode 100644 new mode 100755 diff --git a/local/modules/Colissimo/Config/config.xml b/local/modules/Colissimo/Config/config.xml old mode 100644 new mode 100755 diff --git a/local/modules/Colissimo/Config/plugin.xml b/local/modules/Colissimo/Config/plugin.xml old mode 100644 new mode 100755 diff --git a/local/modules/Colissimo/Config/schema.xml b/local/modules/Colissimo/Config/schema.xml old mode 100644 new mode 100755 diff --git a/local/modules/DebugBar/Config/config.xml b/local/modules/DebugBar/Config/config.xml old mode 100644 new mode 100755 diff --git a/local/modules/DebugBar/Config/plugin.xml b/local/modules/DebugBar/Config/plugin.xml old mode 100644 new mode 100755 diff --git a/local/modules/DebugBar/Config/schema.xml b/local/modules/DebugBar/Config/schema.xml old mode 100644 new mode 100755 diff --git a/local/modules/DebugBar/DataCollector/PropelCollector.php b/local/modules/DebugBar/DataCollector/PropelCollector.php old mode 100644 new mode 100755 diff --git a/local/modules/DebugBar/DebugBar.php b/local/modules/DebugBar/DebugBar.php old mode 100644 new mode 100755 diff --git a/local/modules/DebugBar/Listeners/DebugBarListeners.php b/local/modules/DebugBar/Listeners/DebugBarListeners.php old mode 100644 new mode 100755 diff --git a/local/modules/DebugBar/Smarty/Plugin/DebugBar.php b/local/modules/DebugBar/Smarty/Plugin/DebugBar.php old mode 100644 new mode 100755 From d8b5df416214f83de2f047f4c2aeeb35003a1530 Mon Sep 17 00:00:00 2001 From: Etienne Roudeix Date: Mon, 16 Sep 2013 15:24:08 +0200 Subject: [PATCH 08/74] delivery process --- .../Thelia/Core/Template/Loop/Delivery.php | 15 +++++++-- core/lib/Thelia/Module/BaseModule.php | 3 ++ install/insert.sql | 3 +- local/config/schema.xml | 3 +- templates/default/cart_billing.html | 31 ++++++++++++------- 5 files changed, 39 insertions(+), 16 deletions(-) diff --git a/core/lib/Thelia/Core/Template/Loop/Delivery.php b/core/lib/Thelia/Core/Template/Loop/Delivery.php index a0e9ebb7a..b679e5061 100644 --- a/core/lib/Thelia/Core/Template/Loop/Delivery.php +++ b/core/lib/Thelia/Core/Template/Loop/Delivery.php @@ -22,9 +22,12 @@ /*************************************************************************************/ namespace Thelia\Core\Template\Loop; +use Propel\Runtime\ActiveQuery\Criteria; use Thelia\Core\Template\Element\LoopResult; use Thelia\Core\Template\Element\LoopResultRow; use Thelia\Core\Template\Loop\Argument\Argument; +use Thelia\Model\CountryQuery; +use Thelia\Module\BaseModule; /** * Class Delivery @@ -39,7 +42,7 @@ class Delivery extends BaseSpecificModule $collection = parent::getArgDefinitions(); $collection->addArgument( - Argument::createIntTypeArgument("country") + Argument::createIntTypeArgument("country", null, true) ); return $collection; @@ -50,6 +53,14 @@ class Delivery extends BaseSpecificModule $search = parent::exec($pagination); /* manage translations */ $locale = $this->configureI18nProcessing($search); + + $search->filterByType(BaseModule::DELIVERY_MODULE_TYPE, Criteria::EQUAL); + + $country = $this->getCountry(); + if(null !== $country) { + //@todo + } + /* perform search */ $deliveryModules = $this->search($search, $pagination); @@ -73,7 +84,7 @@ class Delivery extends BaseSpecificModule ->set('CHAPO', $deliveryModule->getVirtualColumn('i18n_CHAPO')) ->set('DESCRIPTION', $deliveryModule->getVirtualColumn('i18n_DESCRIPTION')) ->set('POSTSCRIPTUM', $deliveryModule->getVirtualColumn('i18n_POSTSCRIPTUM')) - ->set('PRICE', $moduleInstance->calculate($this->getCountry())) + ->set('PRICE', $moduleInstance->calculate(CountryQuery::create()->findPk($country))) ; $loopResult->addRow($loopResultRow); diff --git a/core/lib/Thelia/Module/BaseModule.php b/core/lib/Thelia/Module/BaseModule.php index 9d76e08f3..a13403482 100755 --- a/core/lib/Thelia/Module/BaseModule.php +++ b/core/lib/Thelia/Module/BaseModule.php @@ -28,6 +28,9 @@ use Symfony\Component\DependencyInjection\ContainerAware; abstract class BaseModule extends ContainerAware { + const CLASSIC_MODULE_TYPE = 1; + const DELIVERY_MODULE_TYPE = 2; + const PAYMENT_MODULE_TYPE = 3; public function __construct() { diff --git a/install/insert.sql b/install/insert.sql index 03fbc690c..a49dc7231 100755 --- a/install/insert.sql +++ b/install/insert.sql @@ -28,7 +28,8 @@ INSERT INTO `config` (`name`, `value`, `secured`, `hidden`, `created_at`, `updat INSERT INTO `module` (`id`, `code`, `type`, `activate`, `position`, `full_namespace`, `created_at`, `updated_at`) VALUES -(1, 'DebugBar', 1, 1, 1, 'DebugBar\\DebugBar', NOW(), NOW()); +(1, 'DebugBar', 1, 1, 1, 'DebugBar\\DebugBar', NOW(), NOW()), +(2, 'Colissimo', 2, 1, 1, 'Colissimo\\Colissimo', NOW(), NOW()); INSERT INTO `customer_title`(`id`, `by_default`, `position`, `created_at`, `updated_at`) VALUES (1, 1, 1, NOW(), NOW()), diff --git a/local/config/schema.xml b/local/config/schema.xml index 49a76ebed..186bdbfd6 100755 --- a/local/config/schema.xml +++ b/local/config/schema.xml @@ -1,4 +1,4 @@ - + @@ -80,6 +80,7 @@ + diff --git a/templates/default/cart_billing.html b/templates/default/cart_billing.html index d44753e48..8720bf696 100644 --- a/templates/default/cart_billing.html +++ b/templates/default/cart_billing.html @@ -48,18 +48,29 @@ @@ -83,18 +94,14 @@
Choose your delivery method
+ {loop type="delivery" name="deliveries" force_return="true"}
-
- -
+ {/loop}
From 785057c0be9fffd32221c6fdff4b0270ab39c535 Mon Sep 17 00:00:00 2001 From: Manuel Raynaud Date: Mon, 16 Sep 2013 15:42:25 +0200 Subject: [PATCH 09/74] add some information for OSX requirements --- Readme.md | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/Readme.md b/Readme.md index 791b61d1e..3481d508c 100755 --- a/Readme.md +++ b/Readme.md @@ -12,13 +12,34 @@ Here is the most recent developed code for the next major version (v2). You can Most part of the code can possibly change, a large part will be refactor soon, graphical setup does not exist yet. +Requirements +------------ + +* php 5.4 +* apache 2 +* mysql 5 + +If you use Mac OSX, they still don't use php 5.4 as default php version... There are many solutions for you : + +* use linux (the better one) +* use last MAMP version and put the php bin directory in your path and : + +```bash +$ vim ~/.bash_profile +then put this line : export PATH=/Applications/MAMP/bin/php/php5.4.x/bin/:$PATH +$ . .bash_profile +``` + +* configure a complete development environment : http://php-osx.liip.ch/ +* use a virtual machine with vagrant and puppet : https://puphpet.com/ + Installation ------------ ``` bash $ git clone --recursive https://github.com/thelia/thelia.git $ cd thelia -$ wget http://getcomposer.org/composer.phar +$ curl -sS https://getcomposer.org/installer | php $ php composer.phar install ``` From 1dcde3ff2ca5925fb0f9b247fbfae1646123ca91 Mon Sep 17 00:00:00 2001 From: Manuel Raynaud Date: Mon, 16 Sep 2013 15:47:32 +0200 Subject: [PATCH 10/74] fix typo --- Readme.md | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/Readme.md b/Readme.md index 3481d508c..c0c3ebef5 100755 --- a/Readme.md +++ b/Readme.md @@ -19,15 +19,13 @@ Requirements * apache 2 * mysql 5 -If you use Mac OSX, they still don't use php 5.4 as default php version... There are many solutions for you : +If you use Mac OSX, it still doesn't use php 5.4 as default php version... There are many solutions for you : -* use linux (the better one) -* use last MAMP version and put the php bin directory in your path and : +* use linux (the best one) +* use last MAMP version and put the php bin directory in your path : ```bash -$ vim ~/.bash_profile -then put this line : export PATH=/Applications/MAMP/bin/php/php5.4.x/bin/:$PATH -$ . .bash_profile +export PATH=/Applications/MAMP/bin/php/php5.4.x/bin/:$PATH ``` * configure a complete development environment : http://php-osx.liip.ch/ From 361e9e11260ecf4ddc5d4ef3aba33af5077b1086 Mon Sep 17 00:00:00 2001 From: Etienne Roudeix Date: Mon, 16 Sep 2013 16:12:04 +0200 Subject: [PATCH 11/74] delivery process --- .../Thelia/Core/Template/Loop/Delivery.php | 15 ++-- .../Template/Loop/ProductSaleElements.php | 2 +- .../Smarty/Plugins/DataAccessFunctions.php | 11 +++ install/insert.sql | 11 ++- templates/default/cart_billing.html | 69 ++++++++++++++++++- 5 files changed, 98 insertions(+), 10 deletions(-) diff --git a/core/lib/Thelia/Core/Template/Loop/Delivery.php b/core/lib/Thelia/Core/Template/Loop/Delivery.php index b679e5061..dea302797 100644 --- a/core/lib/Thelia/Core/Template/Loop/Delivery.php +++ b/core/lib/Thelia/Core/Template/Loop/Delivery.php @@ -42,7 +42,7 @@ class Delivery extends BaseSpecificModule $collection = parent::getArgDefinitions(); $collection->addArgument( - Argument::createIntTypeArgument("country", null, true) + Argument::createIntTypeArgument("country") ); return $collection; @@ -56,9 +56,14 @@ class Delivery extends BaseSpecificModule $search->filterByType(BaseModule::DELIVERY_MODULE_TYPE, Criteria::EQUAL); - $country = $this->getCountry(); - if(null !== $country) { - //@todo + $countryId = $this->getCountry(); + if(null !== $countryId) { + $country = CountryQuery::create()->findPk($countryId); + if(null === $country) { + throw new \InvalidArgumentException('Cannot found country id: `' . $countryId . '` in delivery loop'); + } + } else { + $country = CountryQuery::create()->findOneByByDefault(1); } /* perform search */ @@ -84,7 +89,7 @@ class Delivery extends BaseSpecificModule ->set('CHAPO', $deliveryModule->getVirtualColumn('i18n_CHAPO')) ->set('DESCRIPTION', $deliveryModule->getVirtualColumn('i18n_DESCRIPTION')) ->set('POSTSCRIPTUM', $deliveryModule->getVirtualColumn('i18n_POSTSCRIPTUM')) - ->set('PRICE', $moduleInstance->calculate(CountryQuery::create()->findPk($country))) + ->set('PRICE', $moduleInstance->calculate($country)) ; $loopResult->addRow($loopResultRow); diff --git a/core/lib/Thelia/Core/Template/Loop/ProductSaleElements.php b/core/lib/Thelia/Core/Template/Loop/ProductSaleElements.php index 980ade454..e27626129 100755 --- a/core/lib/Thelia/Core/Template/Loop/ProductSaleElements.php +++ b/core/lib/Thelia/Core/Template/Loop/ProductSaleElements.php @@ -115,7 +115,7 @@ class ProductSaleElements extends BaseLoop $currencyId = $this->getCurrency(); if (null !== $currencyId) { - $currency = CurrencyQuery::create()->findOneById($currencyId); + $currency = CurrencyQuery::create()->findPk($currencyId); if (null === $currency) { throw new \InvalidArgumentException('Cannot found currency id: `' . $currency . '` in product_sale_elements loop'); } diff --git a/core/lib/Thelia/Core/Template/Smarty/Plugins/DataAccessFunctions.php b/core/lib/Thelia/Core/Template/Smarty/Plugins/DataAccessFunctions.php index cc99bfe50..bb220531c 100755 --- a/core/lib/Thelia/Core/Template/Smarty/Plugins/DataAccessFunctions.php +++ b/core/lib/Thelia/Core/Template/Smarty/Plugins/DataAccessFunctions.php @@ -155,6 +155,16 @@ class DataAccessFunctions extends AbstractSmartyPlugin } } + public function countryDataAccess($params, $smarty) + { + $defaultCountry = CountryQuery::create()->findOneByByDefault(1); + + switch($params["attr"]) { + case "default": + return $defaultCountry->getId(); + } + } + public function cartDataAccess($params, $smarty) { $cart = $this->getCart($this->request); @@ -287,6 +297,7 @@ class DataAccessFunctions extends AbstractSmartyPlugin new SmartyPluginDescriptor('function', 'content', $this, 'contentDataAccess'), new SmartyPluginDescriptor('function', 'folder', $this, 'folderDataAccess'), new SmartyPluginDescriptor('function', 'currency', $this, 'currencyDataAccess'), + new SmartyPluginDescriptor('function', 'country', $this, 'countryDataAccess'), new SmartyPluginDescriptor('function', 'lang', $this, 'langDataAccess'), new SmartyPluginDescriptor('function', 'cart', $this, 'cartDataAccess'), ); diff --git a/install/insert.sql b/install/insert.sql index 01d7fbce2..348e447c2 100755 --- a/install/insert.sql +++ b/install/insert.sql @@ -31,6 +31,11 @@ INSERT INTO `module` (`id`, `code`, `type`, `activate`, `position`, `full_namesp (1, 'DebugBar', 1, 1, 1, 'DebugBar\\DebugBar', NOW(), NOW()), (2, 'Colissimo', 2, 1, 1, 'Colissimo\\Colissimo', NOW(), NOW()); +INSERT INTO `thelia_2`.`module_i18n` (`id`, `locale`, `title`, `description`, `chapo`, `postscriptum`) VALUES +('2', 'en_US', '72h delivery', NULL, NULL, NULL), +('2', 'fr_FR', 'Livraison par colissimo en 72h', NULL, NULL, NULL); + + INSERT INTO `customer_title`(`id`, `by_default`, `position`, `created_at`, `updated_at`) VALUES (1, 1, 1, NOW(), NOW()), (2, 0, 2, NOW(), NOW()), @@ -44,13 +49,13 @@ INSERT INTO `customer_title_i18n` (`id`, `locale`, `short`, `long`) VALUES (3, 'fr_FR', 'Mlle', 'Madamemoiselle'), (3, 'en_US', 'Miss', 'Miss'); -INSERT INTO `currency` (`id` ,`code` ,`symbol` ,`rate`, `position` ,`by_default` ,`created_at` ,`updated_at`) +INSERT INTO `currency` (`id`, `code`, `symbol`, `rate`, `position`, `by_default`, `created_at`, `updated_at`) VALUES -(1, 'EUR', '€', '1', 1, '1', NOW() , NOW()), +(1, 'EUR', '€', '1', 1, '1', NOW(), NOW()), (2, 'USD', '$', '1.26', 2, '0', NOW(), NOW()), (3, 'GBP', '£', '0.89', 3, '0', NOW(), NOW()); -INSERT INTO `currency_i18n` (`id` ,`locale` ,`name`) +INSERT INTO `currency_i18n` (`id`, `locale`, `name`) VALUES (1, 'fr_FR', 'Euro'), (1, 'en_US', 'Euro'), diff --git a/templates/default/cart_billing.html b/templates/default/cart_billing.html index 8720bf696..123596609 100644 --- a/templates/default/cart_billing.html +++ b/templates/default/cart_billing.html @@ -25,6 +25,73 @@
+ +
+
+ Add a new address + Chose your billing address +
+
+
  • - M. DUPONT Jean - Agency XY + {loop type="title" name="customer.title.info" id=$TITLE}{$SHORT}{/loop} {$LASTNAME|upper} {$FIRSTNAME|ucwords} + {$COMPANY}
  • - street name of my business
    - 75000 - City, Country + {$ADDRESS1} + {if $ADDRESS2 != ""} +
    {$ADDRESS2} + {/if} + {if $ADDRESS3 != ""} +
    {$ADDRESS3} + {/if} +
    {$ZIPCODE} + {$CITY}, {loop type="country" name="customer.country.info" id=$COUNTRY}{$TITLE}{/loop}
  • - +33 09 08 07 06 05 + {if $CELLPHONE != ""} + {$CELLPHONE} + {/if} + {if $PHONE != ""} +
    {$PHONE} + {/if}
+ + + {loop type="address" name="customer.addresses" customer="current"} + + + + + + + + {/loop} + + + + + +
Add a new address @@ -98,7 +165,7 @@
{/loop} From 2309a2e7885a1f763291cc0429f1767ee94a87ac Mon Sep 17 00:00:00 2001 From: Manuel Raynaud Date: Mon, 16 Sep 2013 16:29:09 +0200 Subject: [PATCH 12/74] remove script part of composer.json file --- composer.json | 4 ---- 1 file changed, 4 deletions(-) diff --git a/composer.json b/composer.json index 2d315bd3a..c8291305d 100755 --- a/composer.json +++ b/composer.json @@ -53,9 +53,5 @@ "": "local/modules/", "Thelia" : "core/lib/" } - }, - "scripts" : { - "post-update-cmd": "composer dump-autoload -o", - "post-install-cmd": "composer dump-autoload -o" } } From aa4e0636e8f270d4c3f79cba3d758bb4a9954822 Mon Sep 17 00:00:00 2001 From: Manuel Raynaud Date: Mon, 16 Sep 2013 16:31:13 +0200 Subject: [PATCH 13/74] use dump autoloader in all compser scripts --- Readme.md | 2 +- composer.lock | 2 +- reset_install.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Readme.md b/Readme.md index c0c3ebef5..ac0862dae 100755 --- a/Readme.md +++ b/Readme.md @@ -38,7 +38,7 @@ Installation $ git clone --recursive https://github.com/thelia/thelia.git $ cd thelia $ curl -sS https://getcomposer.org/installer | php -$ php composer.phar install +$ php composer.phar install --optimize-autoloader ``` Finish the installation using cli tools : diff --git a/composer.lock b/composer.lock index 61160ea49..acc232713 100755 --- a/composer.lock +++ b/composer.lock @@ -3,7 +3,7 @@ "This file locks the dependencies of your project to a known state", "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file" ], - "hash": "28dfdc7a840f9e70df422581f82a871f", + "hash": "6db52c20c300000aa218e3be92ef978e", "packages": [ { "name": "imagine/imagine", diff --git a/reset_install.sh b/reset_install.sh index 399156b67..380a80a5f 100755 --- a/reset_install.sh +++ b/reset_install.sh @@ -8,7 +8,7 @@ echo -e "\n\e[01;34m[INFO] Clearing caches\e[00m\n" php Thelia cache:clear echo -e "\n\e[01;34m[INFO] Downloading vendors\e[00m\n" -composer install --prefer-dist +composer install --prefer-dist --optimize-autoloader cd local/config/ From bf3bc02f8b8c5e01bd810065fdc3ed2fa35848ed Mon Sep 17 00:00:00 2001 From: Etienne Roudeix Date: Mon, 16 Sep 2013 16:46:12 +0200 Subject: [PATCH 14/74] fix fixture dependant unit test --- install/faker.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/install/faker.php b/install/faker.php index 66303f05a..11aad8651 100755 --- a/install/faker.php +++ b/install/faker.php @@ -189,7 +189,7 @@ try { $featureList = array(); for($i=0; $i<4; $i++) { $feature = new Thelia\Model\Feature(); - $feature->setVisible(rand(1, 10)>7 ? 0 : 1); + $feature->setVisible(1); $feature->setPosition($i); setI18n($faker, $feature); @@ -257,7 +257,7 @@ try { for($i=0; $i<4; $i++) { $folder = new Thelia\Model\Folder(); $folder->setParent(0); - $folder->setVisible(rand(1, 10)>7 ? 0 : 1); + $folder->setVisible(1); $folder->setPosition($i); setI18n($faker, $folder); @@ -270,7 +270,7 @@ try { for($j=1; $jsetParent($folder->getId()); - $subfolder->setVisible(rand(1, 10)>7 ? 0 : 1); + $subfolder->setVisible(1); $subfolder->setPosition($j); setI18n($faker, $subfolder); @@ -283,7 +283,7 @@ try { for($k=0; $kaddFolder($subfolder); - $content->setVisible(rand(1, 10)>7 ? 0 : 1); + $content->setVisible(1); $content->setPosition($k); setI18n($faker, $content); @@ -418,7 +418,7 @@ function createProduct($faker, $category, $position, $template, &$productIdList) $product = new Thelia\Model\Product(); $product->setRef($category->getId() . '_' . $position . '_' . $faker->randomNumber(8)); $product->addCategory($category); - $product->setVisible(rand(1, 10)>7 ? 0 : 1); + $product->setVisible(1); $product->setPosition($position); $product->setTaxRuleId(1); $product->setTemplate($template); @@ -440,7 +440,7 @@ function createCategory($faker, $parent, $position, &$categoryIdList, $contentId { $category = new Thelia\Model\Category(); $category->setParent($parent); - $category->setVisible(rand(1, 10)>7 ? 0 : 1); + $category->setVisible(1); $category->setPosition($position); setI18n($faker, $category); From 035d9dd0e94fdcb992d72518bb8d7f9dd4da4582 Mon Sep 17 00:00:00 2001 From: Manuel Raynaud Date: Mon, 16 Sep 2013 16:57:08 +0200 Subject: [PATCH 15/74] add swiftmailer in composer --- composer.json | 3 ++- composer.lock | 51 ++++++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 52 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index c8291305d..4a3798384 100755 --- a/composer.json +++ b/composer.json @@ -36,7 +36,8 @@ "simplepie/simplepie": "dev-master", "imagine/imagine": "dev-master", - "symfony/icu": "1.0" + "symfony/icu": "1.0", + "swiftmailer/swiftmailer": "5.0.*" }, "require-dev" : { "phpunit/phpunit": "3.7.*", diff --git a/composer.lock b/composer.lock index acc232713..b0310c075 100755 --- a/composer.lock +++ b/composer.lock @@ -3,7 +3,7 @@ "This file locks the dependencies of your project to a known state", "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file" ], - "hash": "6db52c20c300000aa218e3be92ef978e", + "hash": "a40be01c82e68ba0c446dc204d2667da", "packages": [ { "name": "imagine/imagine", @@ -445,6 +445,55 @@ ], "time": "2013-07-02 16:38:47" }, + { + "name": "swiftmailer/swiftmailer", + "version": "v5.0.2", + "source": { + "type": "git", + "url": "https://github.com/swiftmailer/swiftmailer.git", + "reference": "f3917ecef35a4e4d98b303eb9fee463bc983f379" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/swiftmailer/swiftmailer/zipball/f3917ecef35a4e4d98b303eb9fee463bc983f379", + "reference": "f3917ecef35a4e4d98b303eb9fee463bc983f379", + "shasum": "" + }, + "require": { + "php": ">=5.2.4" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "5.1-dev" + } + }, + "autoload": { + "files": [ + "lib/swift_required.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Chris Corbyn" + } + ], + "description": "Swiftmailer, free feature-rich PHP mailer", + "homepage": "http://swiftmailer.org", + "keywords": [ + "mail", + "mailer" + ], + "time": "2013-08-30 12:35:21" + }, { "name": "symfony-cmf/routing", "version": "1.0.0", From cfc52c4e7fade57c5d5f5f157eab6a3c84de5cc9 Mon Sep 17 00:00:00 2001 From: gmorel Date: Mon, 16 Sep 2013 18:15:09 +0200 Subject: [PATCH 16/74] Working : install wizard : type inference --- core/lib/Thelia/Controller/BaseController.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/core/lib/Thelia/Controller/BaseController.php b/core/lib/Thelia/Controller/BaseController.php index 19e62a400..d5c54e991 100755 --- a/core/lib/Thelia/Controller/BaseController.php +++ b/core/lib/Thelia/Controller/BaseController.php @@ -31,6 +31,7 @@ use Symfony\Component\Routing\Exception\MissingMandatoryParametersException; use Symfony\Component\Routing\Exception\RouteNotFoundException; use Symfony\Component\Routing\Router; use Thelia\Core\Security\SecurityContext; +use Thelia\Core\Translation\Translator; use Thelia\Tools\URL; use Thelia\Tools\Redirect; use Thelia\Core\Template\ParserContext; @@ -89,7 +90,7 @@ class BaseController extends ContainerAware * * return the Translator * - * @return mixed \Thelia\Core\Translation\Translator + * @return Translator */ public function getTranslator() { From 874c5f6cacc6a83e25b710ca4836c22f0d4e32db Mon Sep 17 00:00:00 2001 From: Manuel Raynaud Date: Mon, 16 Sep 2013 18:20:15 +0200 Subject: [PATCH 17/74] integrate swiftMailer as mailer solution --- core/lib/Thelia/Config/Resources/config.xml | 4 + core/lib/Thelia/Controller/BaseController.php | 9 ++ .../Core/Event/MailTransporterEvent.php | 52 +++++++++++ core/lib/Thelia/Core/Event/TheliaEvents.php | 5 + core/lib/Thelia/Mailer/MailerFactory.php | 91 +++++++++++++++++++ 5 files changed, 161 insertions(+) create mode 100644 core/lib/Thelia/Core/Event/MailTransporterEvent.php create mode 100644 core/lib/Thelia/Mailer/MailerFactory.php diff --git a/core/lib/Thelia/Config/Resources/config.xml b/core/lib/Thelia/Config/Resources/config.xml index 691cf2198..bed490b4a 100755 --- a/core/lib/Thelia/Config/Resources/config.xml +++ b/core/lib/Thelia/Config/Resources/config.xml @@ -267,6 +267,10 @@ + + + + diff --git a/core/lib/Thelia/Controller/BaseController.php b/core/lib/Thelia/Controller/BaseController.php index 19e62a400..8bf9aeec3 100755 --- a/core/lib/Thelia/Controller/BaseController.php +++ b/core/lib/Thelia/Controller/BaseController.php @@ -281,4 +281,13 @@ class BaseController extends ContainerAware $this->accessDenied(); } } + + /** + * @return \Swift_Mailer + */ + public function getMailer() + { + $mailer = $this->container->get('mailer'); + return $mailer->getSwiftMailer(); + } } diff --git a/core/lib/Thelia/Core/Event/MailTransporterEvent.php b/core/lib/Thelia/Core/Event/MailTransporterEvent.php new file mode 100644 index 000000000..d47ac693f --- /dev/null +++ b/core/lib/Thelia/Core/Event/MailTransporterEvent.php @@ -0,0 +1,52 @@ +. */ +/* */ +/*************************************************************************************/ + +namespace Thelia\Core\Event; + + +/** + * Class MailTransporterEvent + * @package Thelia\Core\Event + * @author Manuel Raynaud + */ +class MailTransporterEvent extends ActionEvent { + /** + * @var \Swift_Transport + */ + protected $transporter; + + public function setMailerTransporter(\Swift_Transport $transporter) + { + $this->transporter = $transporter; + } + + public function getTransporter() + { + return $this->transporter; + } + + public function hasTransporter() + { + return null !== $this->transporter; + } +} \ No newline at end of file diff --git a/core/lib/Thelia/Core/Event/TheliaEvents.php b/core/lib/Thelia/Core/Event/TheliaEvents.php index 2867762aa..242fde4e4 100755 --- a/core/lib/Thelia/Core/Event/TheliaEvents.php +++ b/core/lib/Thelia/Core/Event/TheliaEvents.php @@ -430,4 +430,9 @@ final class TheliaEvents const BEFORE_DELETEFEATURE_AV = "action.before_deleteFeatureAv"; const AFTER_DELETEFEATURE_AV = "action.after_deleteFeatureAv"; + /** + * sent when system find a mailer transporter. + */ + const MAILTRANSPORTER_CONFIG = 'action.mailertransporter.config'; + } diff --git a/core/lib/Thelia/Mailer/MailerFactory.php b/core/lib/Thelia/Mailer/MailerFactory.php new file mode 100644 index 000000000..5cd952270 --- /dev/null +++ b/core/lib/Thelia/Mailer/MailerFactory.php @@ -0,0 +1,91 @@ +. */ +/* */ +/*************************************************************************************/ + +namespace Thelia\Mailer; +use Symfony\Component\EventDispatcher\EventDispatcherInterface; +use Thelia\Core\Event\MailTransporterEvent; +use Thelia\Core\Event\TheliaEvents; +use Thelia\Model\ConfigQuery; + + +/** + * Class MailerFactory + * @package Thelia\Mailer + * @author Manuel Raynaud + */ +class MailerFactory { + /** + * @var \Swift_Mailer + */ + protected $swiftMailer; + + protected $dispatcher; + + public function _construct(EventDispatcherInterface $dispatcher) + { + + $this->dispatcher = $dispatcher; + + $transporterEvent = new MailTransporterEvent(); + $this->dispatcher->dispatch(TheliaEvents::MAILTRANSPORTER_CONFIG, $transporterEvent); + + if($transporterEvent->hasTransporter()) { + $transporter = $transporterEvent->getTransporter(); + } else { + if (ConfigQuery::read("smtp.enabled")) { + $transporter = $this->configureSmtp(); + } else { + $transporter = \Swift_MailTransport::newInstance(); + } + } + + $this->swiftMailer = new \Swift_Mailer($transporter); + } + + private function configureSmtp() + { + $smtpTransporter = new \Swift_SmtpTransport(); + $smtpTransporter->setHost(Configquery::read('smtp.host', 'localhost')) + ->setPort(ConfigQuery::read('smtp.host')) + ->setEncryption(ConfigQuery::read('smtp.encryption')) + ->setUsername(ConfigQuery::read('smtp.username')) + ->setPassword(ConfigQuery::read('smtp.password')) + ->setAuthMode(ConfigQuery::read('smtp.authmode')) + ->setTimeout(ConfigQuery::read('smtp.timeout', 30)) + ->setSourceIp(ConfigQuery::read('smtp.sourceip')) + ; + return $smtpTransporter; + } + + public function send(\Swift_Mime_Message $message, &$failedRecipients = null) + { + $this->swiftMailer->send($message, $failedRecipients); + } + + public function getSwiftMailer() + { + return $this->swiftMailer; + } + + +} \ No newline at end of file From 67b6e5f07de74cfd019d3b5c32141067fde3c981 Mon Sep 17 00:00:00 2001 From: Manuel Raynaud Date: Mon, 16 Sep 2013 18:21:07 +0200 Subject: [PATCH 18/74] add some php doc --- core/lib/Thelia/Controller/BaseController.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/core/lib/Thelia/Controller/BaseController.php b/core/lib/Thelia/Controller/BaseController.php index 8bf9aeec3..3c4c0a5bc 100755 --- a/core/lib/Thelia/Controller/BaseController.php +++ b/core/lib/Thelia/Controller/BaseController.php @@ -283,6 +283,9 @@ class BaseController extends ContainerAware } /** + * + * return an instance of \Swift_Mailer with good Transporter configured. + * * @return \Swift_Mailer */ public function getMailer() From afa9a46abf332ee2850996d2c078b9be8e253172 Mon Sep 17 00:00:00 2001 From: Etienne Roudeix Date: Mon, 16 Sep 2013 18:55:29 +0200 Subject: [PATCH 19/74] order delivery form --- core/lib/Thelia/Config/Resources/config.xml | 2 + .../Thelia/Config/Resources/routing/front.xml | 15 ++- .../Controller/Front/OrderController.php | 79 ++++++++++++++ core/lib/Thelia/Core/Event/OrderEvent.php | 101 ++++++++++++++++++ core/lib/Thelia/Core/Event/TheliaEvents.php | 9 +- .../Core/HttpFoundation/Session/Session.php | 20 ++-- core/lib/Thelia/Form/OrderDelivery.php | 94 ++++++++++++++++ templates/default/cart.html | 2 +- templates/default/cart_billing.html | 4 +- 9 files changed, 307 insertions(+), 19 deletions(-) create mode 100755 core/lib/Thelia/Controller/Front/OrderController.php create mode 100755 core/lib/Thelia/Core/Event/OrderEvent.php create mode 100755 core/lib/Thelia/Form/OrderDelivery.php diff --git a/core/lib/Thelia/Config/Resources/config.xml b/core/lib/Thelia/Config/Resources/config.xml index 691cf2198..0eda0c37b 100755 --- a/core/lib/Thelia/Config/Resources/config.xml +++ b/core/lib/Thelia/Config/Resources/config.xml @@ -58,6 +58,8 @@ + + diff --git a/core/lib/Thelia/Config/Resources/routing/front.xml b/core/lib/Thelia/Config/Resources/routing/front.xml index cea964153..a8b91a05d 100755 --- a/core/lib/Thelia/Config/Resources/routing/front.xml +++ b/core/lib/Thelia/Config/Resources/routing/front.xml @@ -98,11 +98,6 @@ cart - - Thelia\Controller\Front\DefaultController::noAction - cart_billing - - Thelia\Controller\Front\CartController::addItem @@ -117,6 +112,16 @@ cart + + Thelia\Controller\Front\DefaultController::noAction + cart_billing + + + + Thelia\Controller\Front\OrderController::deliver + cart_billing + + diff --git a/core/lib/Thelia/Controller/Front/OrderController.php b/core/lib/Thelia/Controller/Front/OrderController.php new file mode 100755 index 000000000..0508b4dc9 --- /dev/null +++ b/core/lib/Thelia/Controller/Front/OrderController.php @@ -0,0 +1,79 @@ +. */ +/* */ +/*************************************************************************************/ +namespace Thelia\Controller\Front; + +use Propel\Runtime\Exception\PropelException; +use Thelia\Form\Exception\FormValidationException; +use Thelia\Core\Event\OrderEvent; +use Thelia\Core\Event\TheliaEvents; +use Symfony\Component\HttpFoundation\Request; +use Thelia\Model\Order; + +class OrderController extends BaseFrontController +{ + /** + * set billing address + * set delivery address + * set delivery module + */ + public function deliver() + { + $orderEvent = $this->getOrderEvent(); + //$orderEvent->setBillingAddress($this->getRequest()->get("billing-address")); + $orderEvent->setDeliveryAddress($this->getRequest()->get("delivery-address")); + $orderEvent->setDeliveryModule($this->getRequest()->get("delivery-module")); + + try { + //$this->getDispatcher()->dispatch(TheliaEvents::ORDER_SET_BILLING_ADDRESS, $orderEvent); + $this->getDispatcher()->dispatch(TheliaEvents::ORDER_SET_DELIVERY_ADDRESS, $orderEvent); + $this->getDispatcher()->dispatch(TheliaEvents::ORDER_SET_DELIVERY_MODULE, $orderEvent); + + $this->redirectSuccess(); + } catch (PropelException $e) { + $this->getParserContext()->setGeneralError($e->getMessage()); + } + + } + + protected function getOrderEvent() + { + $order = $this->getOrder($this->getRequest()); + + return new OrderEvent($order); + } + + public function getOrder(Request $request) + { + $session = $request->getSession(); + + if (null !== $order = $session->getOrder()) { + return $order; + } + + $order = new Order(); + + $session->setOrder($order); + + return $order; + } +} diff --git a/core/lib/Thelia/Core/Event/OrderEvent.php b/core/lib/Thelia/Core/Event/OrderEvent.php new file mode 100755 index 000000000..8b6762e99 --- /dev/null +++ b/core/lib/Thelia/Core/Event/OrderEvent.php @@ -0,0 +1,101 @@ +. */ +/* */ +/*************************************************************************************/ + +namespace Thelia\Core\Event; + +use Thelia\Model\Address; +use Thelia\Model\AddressQuery; +use Thelia\Model\Module; +use Thelia\Model\Order; + +class OrderEvent extends ActionEvent +{ + protected $order = null; + protected $billingAddress = null; + protected $deliveryAddress = null; + protected $deliveryModule = null; + + /** + * @param Order $order + */ + public function __construct(Order $order) + { + $this->order = $order; + } + + /** + * @param Address $address + */ + public function setBillingAddress(Address $address) + { + $this->deliveryAddress = $address->getId(); + } + + /** + * @param Address $address + */ + public function setDeliveryAddress(Address $address) + { + $this->deliveryAddress = $address->getId(); + } + + /** + * @param Module $module + */ + public function setDeliveryModule(Module $module) + { + $this->deliveryModule = $module->getId(); + } + + /** + * @return null|Order + */ + public function getOrder() + { + return $this->order; + } + + /** + * @return array|mixed|Address + */ + public function getBillingAddress() + { + return AddressQuery::create()->findPk($this->billingAddress); + } + + /** + * @return array|mixed|Address + */ + public function getDeliveryAddress() + { + return AddressQuery::create()->findPk($this->deliveryAddress); + } + + /** + * @return array|mixed|Address + */ + public function getDeliveryModule() + { + return AddressQuery::create()->findPk($this->deliveryModule); + } +} diff --git a/core/lib/Thelia/Core/Event/TheliaEvents.php b/core/lib/Thelia/Core/Event/TheliaEvents.php index 2867762aa..02256a360 100755 --- a/core/lib/Thelia/Core/Event/TheliaEvents.php +++ b/core/lib/Thelia/Core/Event/TheliaEvents.php @@ -218,13 +218,20 @@ final class TheliaEvents const CART_DELETEITEM = "action.deleteArticle"; + /** + * Order linked event + */ + const ORDER_SET_BILLING_ADDRESS = "action.order.setBillingAddress"; + const ORDER_SET_DELIVERY_ADDRESS = "action.order.setDeliveryAddress"; + const ORDER_SET_DELIVERY_MODULE = "action.order.setDeliveryModule"; + /** * Sent on image processing */ const IMAGE_PROCESS = "action.processImage"; /** - * Sent on cimage cache clear request + * Sent on image cache clear request */ const IMAGE_CLEAR_CACHE = "action.clearImageCache"; diff --git a/core/lib/Thelia/Core/HttpFoundation/Session/Session.php b/core/lib/Thelia/Core/HttpFoundation/Session/Session.php index e9e3d50bf..5edd007b3 100755 --- a/core/lib/Thelia/Core/HttpFoundation/Session/Session.php +++ b/core/lib/Thelia/Core/HttpFoundation/Session/Session.php @@ -29,6 +29,7 @@ use Thelia\Exception\InvalidCartException; use Thelia\Model\CartQuery; use Thelia\Model\Cart; use Thelia\Model\Currency; +use Thelia\Model\Order; use Thelia\Tools\URL; use Thelia\Model\Lang; @@ -43,6 +44,8 @@ use Thelia\Model\Lang; class Session extends BaseSession { /** + * @param bool $forceDefault + * * @return \Thelia\Model\Lang|null */ public function getLang($forceDefault = true) @@ -205,22 +208,19 @@ class Session extends BaseSession return $this; } - /** - * assign delivery id in session - * - * @param $delivery_id - * @return $this - */ - public function setDelivery($delivery_id) + // -- Order ------------------------------------------------------------------ + + + public function setOrder(Order $order) { - $this->set("thelia.delivery_id", $delivery_id); + $this->set("thelia.order", $order); return $this; } - public function getDelivery() + public function getOrder() { - return $this->get("thelia.delivery_id"); + return $this->get("thelia.order"); } diff --git a/core/lib/Thelia/Form/OrderDelivery.php b/core/lib/Thelia/Form/OrderDelivery.php new file mode 100755 index 000000000..d0ee0efb3 --- /dev/null +++ b/core/lib/Thelia/Form/OrderDelivery.php @@ -0,0 +1,94 @@ +. */ +/* */ +/*************************************************************************************/ +namespace Thelia\Form; + +use Symfony\Component\Validator\Constraints; +use Symfony\Component\Validator\ExecutionContextInterface; +use Thelia\Model\AddressQuery; +use Thelia\Model\ConfigQuery; +use Thelia\Core\Translation\Translator; +use Thelia\Model\ModuleQuery; +use Thelia\Module\BaseModule; + +/** + * Class OrderDelivery + * @package Thelia\Form + * @author Etienne Roudeix + */ +class OrderDelivery extends BaseForm +{ + protected function buildForm() + { + $this->formBuilder + ->add("delivery-address", "integer", array( + "constraints" => array( + new Constraints\NotBlank(), + new Constraints\Callback(array( + "methods" => array( + array($this, "verifyDeliveryAddress") + ) + )) + ) + )) + ->add("delivery-module", "integer", array( + "constraints" => array( + new Constraints\NotBlank(), + new Constraints\Callback(array( + "methods" => array( + array($this, "verifyDeliveryModule") + ) + )) + ) + )); + } + + public function verifyDeliveryAddress($value, ExecutionContextInterface $context) + { + $address = AddressQuery::create() + ->findPk($value); + + if(null === $address) { + $context->addViolation("Address ID not found"); + } elseif($address->getCustomerId() !== $this->request->getSession()->getCustomerUser()->getId()) { + $context->addViolation("Address does not belong to you"); + } + } + + public function verifyDeliveryModule($value, ExecutionContextInterface $context) + { + $module = ModuleQuery::create() + ->filterByType(BaseModule::DELIVERY_MODULE_TYPE) + ->filterByActivate(1) + ->filterById($value) + ->find(); + + if(null === $module) { + $context->addViolation("Delivery module ID not found"); + } + } + + public function getName() + { + return "thelia_order_delivery"; + } +} \ No newline at end of file diff --git a/templates/default/cart.html b/templates/default/cart.html index 6f91d8581..483e34436 100644 --- a/templates/default/cart.html +++ b/templates/default/cart.html @@ -133,7 +133,7 @@ Continue Shopping - Proceed checkout + Proceed checkout diff --git a/templates/default/cart_billing.html b/templates/default/cart_billing.html index 123596609..45c6eadf1 100644 --- a/templates/default/cart_billing.html +++ b/templates/default/cart_billing.html @@ -24,7 +24,7 @@ 4 Secure payment
- +
@@ -164,7 +164,7 @@ {loop type="delivery" name="deliveries" force_return="true"}
From 2f41d4db6f15f88387638af4c70ff51f1ebf2945 Mon Sep 17 00:00:00 2001 From: franck Date: Mon, 16 Sep 2013 18:58:45 +0200 Subject: [PATCH 20/74] Started category management --- core/lib/Thelia/Action/Category.php | 262 +++---- core/lib/Thelia/Action/Config.php | 70 +- core/lib/Thelia/Action/Currency.php | 6 +- core/lib/Thelia/Action/Message.php | 4 +- core/lib/Thelia/Config/Resources/config.xml | 2 +- .../Thelia/Config/Resources/routing/admin.xml | 2 +- .../Admin/AbstractCrudController.php | 59 +- .../Admin/AttributeAvController.php | 2 +- .../Controller/Admin/AttributeController.php | 2 +- .../Controller/Admin/CategoryController.php | 419 ++++------- .../Controller/Admin/ConfigController.php | 2 +- .../Controller/Admin/CurrencyController.php | 2 +- .../Controller/Admin/FeatureAvController.php | 2 +- .../Controller/Admin/FeatureController.php | 2 +- .../Controller/Admin/TemplateController.php | 2 +- .../Thelia/Core/Event/CategoryCreateEvent.php | 20 +- .../Event/CategoryToggleVisibilityEvent.php | 28 + .../Thelia/Core/Event/CategoryUpdateEvent.php | 13 - core/lib/Thelia/Core/Event/TheliaEvents.php | 43 +- .../Core/Template/Loop/CategoryTree.php | 4 +- core/lib/Thelia/Form/CategoryCreationForm.php | 6 +- .../Thelia/Form/CategoryModificationForm.php | 8 +- core/lib/Thelia/Model/Category.php | 24 +- .../default/assets/less/thelia/thelia.less | 8 +- templates/admin/default/categories.html | 710 +++++++----------- templates/admin/default/category-edit.html | 243 +++--- templates/admin/default/currency-edit.html | 8 +- .../default/includes/catalog-breadcrumb.html | 4 +- templates/admin/default/message-edit.html | 12 +- templates/admin/default/orders.html | 6 +- templates/admin/default/variable-edit.html | 6 +- templates/admin/default/variables.html | 2 +- 32 files changed, 772 insertions(+), 1211 deletions(-) create mode 100644 core/lib/Thelia/Core/Event/CategoryToggleVisibilityEvent.php diff --git a/core/lib/Thelia/Action/Category.php b/core/lib/Thelia/Action/Category.php index 297cd64da..a34f4a85e 100755 --- a/core/lib/Thelia/Action/Category.php +++ b/core/lib/Thelia/Action/Category.php @@ -24,52 +24,88 @@ namespace Thelia\Action; use Symfony\Component\EventDispatcher\EventSubscriberInterface; -use Thelia\Core\Event\TheliaEvents; -use Thelia\Model\Category as CategoryModel; + use Thelia\Model\CategoryQuery; +use Thelia\Model\Category as CategoryModel; -use Propel\Runtime\ActiveQuery\Criteria; -use Propel\Runtime\Propel; -use Thelia\Model\Map\CategoryTableMap; +use Thelia\Core\Event\TheliaEvents; +use Thelia\Core\Event\CategoryUpdateEvent; use Thelia\Core\Event\CategoryCreateEvent; use Thelia\Core\Event\CategoryDeleteEvent; +use Thelia\Model\ConfigQuery; +use Thelia\Core\Event\UpdatePositionEvent; use Thelia\Core\Event\CategoryToggleVisibilityEvent; -use Thelia\Core\Event\CategoryChangePositionEvent; class Category extends BaseAction implements EventSubscriberInterface { + /** + * Create a new category entry + * + * @param CategoryCreateEvent $event + */ public function create(CategoryCreateEvent $event) { $category = new CategoryModel(); $category ->setDispatcher($this->getDispatcher()) - ->create( - $event->getTitle(), - $event->getParent(), - $event->getLocale() - ); + + ->setLocale($event->getLocale()) + ->setTitle($event->getTitle()) + ->setParent($event->getParent()) + ->setVisible($event->getVisible()) + + ->save() + ; $event->setCategory($category); } - public function update(CategoryChangeEvent $event) + /** + * Change a category + * + * @param CategoryUpdateEvent $event + */ + public function update(CategoryUpdateEvent $event) { + $search = CategoryQuery::create(); + + if (null !== $category = CategoryQuery::create()->findPk($event->getCategoryId())) { + + $category + ->setDispatcher($this->getDispatcher()) + + ->setLocale($event->getLocale()) + ->setTitle($event->getTitle()) + ->setDescription($event->getDescription()) + ->setChapo($event->getChapo()) + ->setPostscriptum($event->getPostscriptum()) + + ->setParent($event->getParent()) + ->setVisible($event->getVisible()) + + ->save(); + + $event->setCategory($category); + } } /** - * Delete a category + * Delete a category entry * - * @param ActionEvent $event + * @param CategoryDeleteEvent $event */ public function delete(CategoryDeleteEvent $event) { - $category = CategoryQuery::create()->findPk($event->getCategoryId()); + if (null !== $category = CategoryQuery::create()->findPk($event->getCategoryId())) { - if ($category !== null) { + $category + ->setDispatcher($this->getDispatcher()) + ->delete() + ; - $category->setDispatcher($this->getDispatcher())->delete(); + $event->setCategory($category); } } @@ -80,178 +116,48 @@ class Category extends BaseAction implements EventSubscriberInterface */ public function toggleVisibility(CategoryToggleVisibilityEvent $event) { - $category = CategoryQuery::create()->findPk($event->getCategoryId()); + $category = $event->getCategory(); - if ($category !== null) { - - $category - ->setDispatcher($this->getDispatcher()) - ->setVisible($category->getVisible() ? false : true) - ->save() + $category + ->setDispatcher($this->getDispatcher()) + ->setVisible($category->getVisible() ? false : true) + ->save() ; + } + + /** + * Changes position, selecting absolute ou relative change. + * + * @param CategoryChangePositionEvent $event + */ + public function updatePosition(UpdatePositionEvent $event) + { + if (null !== $category = CategoryQuery::create()->findPk($event->getObjectId())) { + + $category->setDispatcher($this->getDispatcher()); + + $mode = $event->getMode(); + + if ($mode == UpdatePositionEvent::POSITION_ABSOLUTE) + return $category->changeAbsolutePosition($event->getPosition()); + else if ($mode == UpdatePositionEvent::POSITION_UP) + return $category->movePositionUp(); + else if ($mode == UpdatePositionEvent::POSITION_DOWN) + return $category->movePositionDown(); } } /** - * Changes category position, selecting absolute ou relative change. - * - * @param CategoryChangePositionEvent $event - */ - public function changePosition(CategoryChangePositionEvent $event) - { - if ($event->getMode() == CategoryChangePositionEvent::POSITION_ABSOLUTE) - return $this->changeAbsolutePosition($event); - else - return $this->exchangePosition($event); - } - - /** - * Move up or down a category - * - * @param CategoryChangePositionEvent $event - */ - protected function exchangePosition(CategoryChangePositionEvent $event) - { - $category = CategoryQuery::create()->findPk($event->getCategoryId()); - - if ($category !== null) { - - // The current position of the category - $my_position = $category->getPosition(); - - // Find category to exchange position with - $search = CategoryQuery::create() - ->filterByParent($category->getParent()); - - // Up or down ? - if ($event->getMode() == CategoryChangePositionEvent::POSITION_UP) { - // Find the category immediately before me - $search->filterByPosition(array('max' => $my_position-1))->orderByPosition(Criteria::DESC); - } elseif ($event->getMode() == CategoryChangePositionEvent::POSITION_DOWN) { - // Find the category immediately after me - $search->filterByPosition(array('min' => $my_position+1))->orderByPosition(Criteria::ASC); - } else - - return; - - $result = $search->findOne(); - - // If we found the proper category, exchange their positions - if ($result) { - - $cnx = Propel::getWriteConnection(CategoryTableMap::DATABASE_NAME); - - $cnx->beginTransaction(); - - try { - $category - ->setDispatcher($this->getDispatcher()) - ->setPosition($result->getPosition()) - ->save() - ; - - $result->setPosition($my_position)->save(); - - $cnx->commit(); - } catch (Exception $e) { - $cnx->rollback(); - } - } - } - } - - /** - * Changes category position - * - * @param CategoryChangePositionEvent $event - */ - protected function changeAbsolutePosition(CategoryChangePositionEvent $event) - { - $category = CategoryQuery::create()->findPk($event->getCategoryId()); - - if ($category !== null) { - - // The required position - $new_position = $event->getPosition(); - - // The current position - $current_position = $category->getPosition(); - - if ($new_position != null && $new_position > 0 && $new_position != $current_position) { - - // Find categories to offset - $search = CategoryQuery::create()->filterByParent($category->getParent()); - - if ($new_position > $current_position) { - // The new position is after the current position -> we will offset + 1 all categories located between us and the new position - $search->filterByPosition(array('min' => 1+$current_position, 'max' => $new_position)); - - $delta = -1; - } else { - // The new position is brefore the current position -> we will offset - 1 all categories located between us and the new position - $search->filterByPosition(array('min' => $new_position, 'max' => $current_position - 1)); - - $delta = 1; - } - - $results = $search->find(); - - $cnx = Propel::getWriteConnection(CategoryTableMap::DATABASE_NAME); - - $cnx->beginTransaction(); - - try { - foreach ($results as $result) { - $result->setPosition($result->getPosition() + $delta)->save($cnx); - } - - $category - ->setDispatcher($this->getDispatcher()) - ->setPosition($new_position) - ->save($cnx) - ; - - $cnx->commit(); - } catch (Exception $e) { - $cnx->rollback(); - } - } - } - } - - /** - * Returns an array of event names this subscriber listens to. - * - * The array keys are event names and the value can be: - * - * * The method name to call (priority defaults to 0) - * * An array composed of the method name to call and the priority - * * An array of arrays composed of the method names to call and respective - * priorities, or 0 if unset - * - * For instance: - * - * * array('eventName' => 'methodName') - * * array('eventName' => array('methodName', $priority)) - * * array('eventName' => array(array('methodName1', $priority), array('methodName2')) - * - * @return array The event names to listen to - * - * @api + * {@inheritDoc} */ public static function getSubscribedEvents() { return array( - TheliaEvents::CATEGORY_CREATE => array("create", 128), - TheliaEvents::CATEGORY_UPDATE => array("update", 128), - TheliaEvents::CATEGORY_DELETE => array("delete", 128), - + TheliaEvents::CATEGORY_CREATE => array("create", 128), + TheliaEvents::CATEGORY_UPDATE => array("update", 128), + TheliaEvents::CATEGORY_DELETE => array("delete", 128), TheliaEvents::CATEGORY_TOGGLE_VISIBILITY => array("toggleVisibility", 128), - TheliaEvents::CATEGORY_CHANGE_POSITION => array("changePosition", 128), - - "action.updateCategoryPositionU" => array("changePositionUp", 128), - "action.updateCategoryPositionDown" => array("changePositionDown", 128), - "action.updateCategoryPosition" => array("changePosition", 128), + TheliaEvents::CATEGORY_UPDATE_POSITION => array("updatePosition", 128) ); } } diff --git a/core/lib/Thelia/Action/Config.php b/core/lib/Thelia/Action/Config.php index 83df28524..f8a7c027c 100644 --- a/core/lib/Thelia/Action/Config.php +++ b/core/lib/Thelia/Action/Config.php @@ -22,7 +22,6 @@ /*************************************************************************************/ namespace Thelia\Action; - use Symfony\Component\EventDispatcher\EventSubscriberInterface; use Thelia\Model\ConfigQuery; @@ -45,18 +44,9 @@ class Config extends BaseAction implements EventSubscriberInterface { $config = new ConfigModel(); - $config - ->setDispatcher($this->getDispatcher()) - - ->setName($event->getEventName()) - ->setValue($event->getValue()) - ->setLocale($event->getLocale()) - ->setTitle($event->getTitle()) - ->setHidden($event->getHidden()) - ->setSecured($event->getSecured()) - - ->save() - ; + $config->setDispatcher($this->getDispatcher())->setName($event->getEventName())->setValue($event->getValue()) + ->setLocale($event->getLocale())->setTitle($event->getTitle())->setHidden($event->getHidden()) + ->setSecured($event->getSecured())->save(); $event->setConfig($config); } @@ -70,18 +60,13 @@ class Config extends BaseAction implements EventSubscriberInterface { $search = ConfigQuery::create(); - if (null !== $config = $search->findOneById($event->getConfigId())) { + if (null !== $config = $search->findPk($event->getConfigId())) { if ($event->getValue() !== $config->getValue()) { - $config - ->setDispatcher($this->getDispatcher()) + $config->setDispatcher($this->getDispatcher())->setValue($event->getValue())->save(); - ->setValue($event->getValue()) - ->save() - ; - - $event->setConfig($config); + $event->setConfig($config); } } } @@ -95,23 +80,12 @@ class Config extends BaseAction implements EventSubscriberInterface { $search = ConfigQuery::create(); - if (null !== $config = ConfigQuery::create()->findOneById($event->getConfigId())) { + if (null !== $config = ConfigQuery::create()->findPk($event->getConfigId())) { - $config - ->setDispatcher($this->getDispatcher()) - - ->setName($event->getEventName()) - ->setValue($event->getValue()) - ->setHidden($event->getHidden()) - ->setSecured($event->getSecured()) - - ->setLocale($event->getLocale()) - ->setTitle($event->getTitle()) - ->setDescription($event->getDescription()) - ->setChapo($event->getChapo()) - ->setPostscriptum($event->getPostscriptum()) - - ->save(); + $config->setDispatcher($this->getDispatcher())->setName($event->getEventName())->setValue($event->getValue()) + ->setHidden($event->getHidden())->setSecured($event->getSecured())->setLocale($event->getLocale()) + ->setTitle($event->getTitle())->setDescription($event->getDescription())->setChapo($event->getChapo()) + ->setPostscriptum($event->getPostscriptum())->save(); $event->setConfig($config); } @@ -125,14 +99,11 @@ class Config extends BaseAction implements EventSubscriberInterface public function delete(ConfigDeleteEvent $event) { - if (null !== ($config = ConfigQuery::create()->findOneById($event->getConfigId()))) { + if (null !== ($config = ConfigQuery::create()->findPk($event->getConfigId()))) { - if (! $config->getSecured()) { + if (!$config->getSecured()) { - $config - ->setDispatcher($this->getDispatcher()) - ->delete() - ; + $config->setDispatcher($this->getDispatcher())->delete(); $event->setConfig($config); } @@ -145,10 +116,15 @@ class Config extends BaseAction implements EventSubscriberInterface public static function getSubscribedEvents() { return array( - TheliaEvents::CONFIG_CREATE => array("create", 128), - TheliaEvents::CONFIG_SETVALUE => array("setValue", 128), - TheliaEvents::CONFIG_UPDATE => array("modify", 128), - TheliaEvents::CONFIG_DELETE => array("delete", 128), + TheliaEvents::CONFIG_CREATE => array( + "create", 128 + ), TheliaEvents::CONFIG_SETVALUE => array( + "setValue", 128 + ), TheliaEvents::CONFIG_UPDATE => array( + "modify", 128 + ), TheliaEvents::CONFIG_DELETE => array( + "delete", 128 + ), ); } } diff --git a/core/lib/Thelia/Action/Currency.php b/core/lib/Thelia/Action/Currency.php index 7908d1f0d..946fee375 100644 --- a/core/lib/Thelia/Action/Currency.php +++ b/core/lib/Thelia/Action/Currency.php @@ -71,7 +71,7 @@ class Currency extends BaseAction implements EventSubscriberInterface { $search = CurrencyQuery::create(); - if (null !== $currency = CurrencyQuery::create()->findOneById($event->getCurrencyId())) { + if (null !== $currency = CurrencyQuery::create()->findPk($event->getCurrencyId())) { $currency ->setDispatcher($this->getDispatcher()) @@ -97,7 +97,7 @@ class Currency extends BaseAction implements EventSubscriberInterface { $search = CurrencyQuery::create(); - if (null !== $currency = CurrencyQuery::create()->findOneById($event->getCurrencyId())) { + if (null !== $currency = CurrencyQuery::create()->findPk($event->getCurrencyId())) { if ($currency->getByDefault() != $event->getIsDefault()) { @@ -123,7 +123,7 @@ class Currency extends BaseAction implements EventSubscriberInterface public function delete(CurrencyDeleteEvent $event) { - if (null !== ($currency = CurrencyQuery::create()->findOneById($event->getCurrencyId()))) { + if (null !== ($currency = CurrencyQuery::create()->findPk($event->getCurrencyId()))) { $currency ->setDispatcher($this->getDispatcher()) diff --git a/core/lib/Thelia/Action/Message.php b/core/lib/Thelia/Action/Message.php index faac35bf2..8918913fe 100644 --- a/core/lib/Thelia/Action/Message.php +++ b/core/lib/Thelia/Action/Message.php @@ -70,7 +70,7 @@ class Message extends BaseAction implements EventSubscriberInterface { $search = MessageQuery::create(); - if (null !== $message = MessageQuery::create()->findOneById($event->getMessageId())) { + if (null !== $message = MessageQuery::create()->findPk($event->getMessageId())) { $message ->setDispatcher($this->getDispatcher()) @@ -99,7 +99,7 @@ class Message extends BaseAction implements EventSubscriberInterface public function delete(MessageDeleteEvent $event) { - if (null !== ($message = MessageQuery::create()->findOneById($event->getMessageId()))) { + if (null !== ($message = MessageQuery::create()->findPk($event->getMessageId()))) { $message ->setDispatcher($this->getDispatcher()) diff --git a/core/lib/Thelia/Config/Resources/config.xml b/core/lib/Thelia/Config/Resources/config.xml index 691cf2198..0c0973db9 100755 --- a/core/lib/Thelia/Config/Resources/config.xml +++ b/core/lib/Thelia/Config/Resources/config.xml @@ -51,7 +51,7 @@ - + diff --git a/core/lib/Thelia/Config/Resources/routing/admin.xml b/core/lib/Thelia/Config/Resources/routing/admin.xml index dc650d8d6..53c137988 100755 --- a/core/lib/Thelia/Config/Resources/routing/admin.xml +++ b/core/lib/Thelia/Config/Resources/routing/admin.xml @@ -85,7 +85,7 @@ - Thelia\Controller\Admin\CategoryController::toggleOnlineAction + Thelia\Controller\Admin\CategoryController::setToggleVisibilityAction diff --git a/core/lib/Thelia/Controller/Admin/AbstractCrudController.php b/core/lib/Thelia/Controller/Admin/AbstractCrudController.php index fad774023..5b7f8b60a 100644 --- a/core/lib/Thelia/Controller/Admin/AbstractCrudController.php +++ b/core/lib/Thelia/Controller/Admin/AbstractCrudController.php @@ -240,6 +240,17 @@ abstract class AbstractCrudController extends BaseAdminController return null; } + /** + * Put in this method post object position change processing if required. + * + * @param unknown $deleteEvent the delete event + * @return Response a response, or null to continue normal processing + */ + protected function performAdditionalUpdatePositionAction($positionChangeEvent) + { + return null; + } + /** * Return the current list order identifier, updating it in the same time. */ @@ -309,14 +320,18 @@ abstract class AbstractCrudController extends BaseAdminController $this->adminLogAppend(sprintf("%s %s (ID %s) created", ucfirst($this->objectName), $this->getObjectLabel($createdObject), $this->getObjectId($createdObject))); } - $this->performAdditionalCreateAction($createEvent); + $response = $this->performAdditionalCreateAction($createEvent); - // Substitute _ID_ in the URL with the ID of the created object - $successUrl = str_replace('_ID_', $this->getObjectId($createdObject), $creationForm->getSuccessUrl()); - - // Redirect to the success URL - $this->redirect($successUrl); + if ($response == null) { + // Substitute _ID_ in the URL with the ID of the created object + $successUrl = str_replace('_ID_', $this->getObjectId($createdObject), $creationForm->getSuccessUrl()); + // Redirect to the success URL + $this->redirect($successUrl); + } + else { + return $response; + } } catch (FormValidationException $ex) { // Form cannot be validated @@ -396,16 +411,21 @@ abstract class AbstractCrudController extends BaseAdminController $this->adminLogAppend(sprintf("%s %s (ID %s) modified", ucfirst($this->objectName), $this->getObjectLabel($changedObject), $this->getObjectId($changedObject))); } - $this->performAdditionalUpdateAction($changeEvent); + $response = $this->performAdditionalUpdateAction($changeEvent); - // If we have to stay on the same page, do not redirect to the succesUrl, - // just redirect to the edit page again. - if ($this->getRequest()->get('save_mode') == 'stay') { - $this->redirectToEditionTemplate($this->getRequest()); + if ($response == null) { + // If we have to stay on the same page, do not redirect to the succesUrl, + // just redirect to the edit page again. + if ($this->getRequest()->get('save_mode') == 'stay') { + $this->redirectToEditionTemplate($this->getRequest()); + } + + // Redirect to the success URL + $this->redirect($changeForm->getSuccessUrl()); + } + else { + return $response; } - - // Redirect to the success URL - $this->redirect($changeForm->getSuccessUrl()); } catch (FormValidationException $ex) { // Form cannot be validated @@ -452,7 +472,14 @@ abstract class AbstractCrudController extends BaseAdminController return $this->errorPage($ex); } - $this->redirectToListTemplate(); + $response = $this->performAdditionalUpdatePositionAction($event); + + if ($response == null) { + $this->redirectToListTemplate(); + } + else { + return $response; + } } /** @@ -475,7 +502,7 @@ abstract class AbstractCrudController extends BaseAdminController return $this->errorPage($ex); } - $this->redirectToRoute('admin.categories.default'); + $this->redirectToListTemplate(); } /** diff --git a/core/lib/Thelia/Controller/Admin/AttributeAvController.php b/core/lib/Thelia/Controller/Admin/AttributeAvController.php index b3afa687d..1ab12a081 100644 --- a/core/lib/Thelia/Controller/Admin/AttributeAvController.php +++ b/core/lib/Thelia/Controller/Admin/AttributeAvController.php @@ -33,7 +33,7 @@ use Thelia\Form\AttributeAvCreationForm; use Thelia\Core\Event\UpdatePositionEvent; /** - * Manages attributes-av sent by mail + * Manages attributes-av * * @author Franck Allimant */ diff --git a/core/lib/Thelia/Controller/Admin/AttributeController.php b/core/lib/Thelia/Controller/Admin/AttributeController.php index 247b89632..48a65baa7 100644 --- a/core/lib/Thelia/Controller/Admin/AttributeController.php +++ b/core/lib/Thelia/Controller/Admin/AttributeController.php @@ -37,7 +37,7 @@ use Thelia\Core\Event\AttributeAvUpdateEvent; use Thelia\Core\Event\AttributeEvent; /** - * Manages attributes sent by mail + * Manages attributes * * @author Franck Allimant */ diff --git a/core/lib/Thelia/Controller/Admin/CategoryController.php b/core/lib/Thelia/Controller/Admin/CategoryController.php index fba832ec8..15f620736 100755 --- a/core/lib/Thelia/Controller/Admin/CategoryController.php +++ b/core/lib/Thelia/Controller/Admin/CategoryController.php @@ -23,226 +23,160 @@ namespace Thelia\Controller\Admin; -use Thelia\Core\Event\TheliaEvents; -use Thelia\Core\Event\CategoryCreateEvent; -use Thelia\Form\CategoryCreationForm; use Thelia\Core\Event\CategoryDeleteEvent; -use Thelia\Core\Event\CategoryUpdatePositionEvent; +use Thelia\Core\Event\TheliaEvents; +use Thelia\Core\Event\CategoryUpdateEvent; +use Thelia\Core\Event\CategoryCreateEvent; use Thelia\Model\CategoryQuery; use Thelia\Form\CategoryModificationForm; +use Thelia\Form\CategoryCreationForm; +use Thelia\Core\Event\UpdatePositionEvent; +use Thelia\Core\Event\CategoryToggleVisibilityEvent; -class CategoryController extends BaseAdminController +/** + * Manages categories + * + * @author Franck Allimant + */ +class CategoryController extends AbstractCrudController { - /** - * Render the categories list, ensuring the sort order is set. - * - * @return Symfony\Component\HttpFoundation\Response the response - */ - protected function renderList() - { - return $this->render('categories', $this->getTemplateArgs()); + public function __construct() { + parent::__construct( + 'category', + 'manual', + 'category_order', + + 'admin.categories.default', + 'admin.categories.create', + 'admin.categories.update', + 'admin.categories.delete', + + TheliaEvents::CATEGORY_CREATE, + TheliaEvents::CATEGORY_UPDATE, + TheliaEvents::CATEGORY_DELETE, + TheliaEvents::CATEGORY_TOGGLE_VISIBILITY, + TheliaEvents::CATEGORY_UPDATE_POSITION + ); } - protected function getTemplateArgs() - { - // Get the category ID - $category_id = $this->getRequest()->get('category_id', 0); + protected function getCreationForm() { + return new CategoryCreationForm($this->getRequest()); + } - // Find the current category order - $category_order = $this->getRequest()->get( - 'order', - $this->getSession()->get('admin.category_order', 'manual') + protected function getUpdateForm() { + return new CategoryModificationForm($this->getRequest()); + } + + protected function getCreationEvent($formData) { + $createEvent = new CategoryCreateEvent(); + + $createEvent + ->setTitle($formData['title']) + ->setLocale($formData["locale"]) + ->setParent($formData['parent']) + ->setVisible($formData['visible']) + ; + + return $createEvent; + } + + protected function getUpdateEvent($formData) { + $changeEvent = new CategoryUpdateEvent($formData['id']); + + // Create and dispatch the change event + $changeEvent + ->setLocale($formData['locale']) + ->setTitle($formData['title']) + ->setChapo($formData['chapo']) + ->setDescription($formData['description']) + ->setPostscriptum($formData['postscriptum']) + ->setVisible($formData['visible']) + ->setUrl($formData['url']) + ->setParent($formData['parent']) + ; + + return $changeEvent; + } + + protected function createUpdatePositionEvent($positionChangeMode, $positionValue) { + + return new UpdatePositionEvent( + $this->getRequest()->get('category_id', null), + $positionChangeMode, + $positionValue + ); + } + + protected function getDeleteEvent() { + return new CategoryDeleteEvent($this->getRequest()->get('category_id', 0)); + } + + protected function eventContainsObject($event) { + return $event->hasCategory(); + } + + protected function hydrateObjectForm($object) { + + // Prepare the data that will hydrate the form + $data = array( + 'id' => $object->getId(), + 'locale' => $object->getLocale(), + 'title' => $object->getTitle(), + 'chapo' => $object->getChapo(), + 'description' => $object->getDescription(), + 'postscriptum' => $object->getPostscriptum(), + 'visible' => $object->getVisible(), + 'url' => $object->getUrl($this->getCurrentEditionLocale()), + 'parent' => $object->getParent() ); - $args = array( - 'current_category_id' => $category_id, - 'category_order' => $category_order, + // Setup the object form + return new CategoryModificationForm($this->getRequest(), "form", $data); + } + + protected function getObjectFromEvent($event) { + return $event->hasCategory() ? $event->getCategory() : null; + } + + protected function getExistingObject() { + return CategoryQuery::create() + ->joinWithI18n($this->getCurrentEditionLocale()) + ->findOneById($this->getRequest()->get('category_id', 0)); + } + + protected function getObjectLabel($object) { + return $object->getTitle(); + } + + protected function getObjectId($object) { + return $object->getId(); + } + + protected function renderListTemplate($currentOrder) { + return $this->render('categories', + array( + 'category_order' => $currentOrder, + 'category_id' => $this->getRequest()->get('category_id', 0) + ) + ); + } + + protected function renderEditionTemplate() { + return $this->render('category-edit', array('category_id' => $this->getRequest()->get('category_id', 0))); + } + + protected function redirectToEditionTemplate() { + $this->redirectToRoute( + "admin.categories.update", + array('category_id' => $this->getRequest()->get('category_id', 0)) ); - - // Store the current sort order in session - $this->getSession()->set('admin.category_order', $category_order); - - return $args; } - /** - * The default action is displaying the categories list. - * - * @return Symfony\Component\HttpFoundation\Response the response - */ - public function defaultAction() - { - if (null !== $response = $this->checkAuth("admin.categories.view")) return $response; - return $this->renderList(); - } - - /** - * Create a new category object - * - * @return Symfony\Component\HttpFoundation\Response the response - */ - public function createAction() - { - // Check current user authorization - if (null !== $response = $this->checkAuth("admin.categories.create")) return $response; - - $error_msg = false; - - // Create the Creation Form - $creationForm = new CategoryCreationForm($this->getRequest()); - - try { - - // Validate the form, create the CategoryCreation event and dispatch it. - $form = $this->validateForm($creationForm, "POST"); - - $data = $form->getData(); - - $createEvent = new CategoryCreateEvent( - $data["title"], - $data["parent"], - $data["locale"] - ); - - $this->dispatch(TheliaEvents::CATEGORY_CREATE, $createEvent); - - if (! $createEvent->hasCategory()) throw new \LogicException($this->getTranslator()->trans("No category was created.")); - - $createdObject = $createEvent->getCategory(); - - // Log category creation - $this->adminLogAppend(sprintf("Category %s (ID %s) created", $createdObject->getTitle(), $createdObject->getId())); - - // Substitute _ID_ in the URL with the ID of the created object - $successUrl = str_replace('_ID_', $createdObject->getId(), $creationForm->getSuccessUrl()); - - // Redirect to the success URL - $this->redirect($successUrl); - } catch (FormValidationException $ex) { - // Form cannot be validated - $error_msg = $this->createStandardFormValidationErrorMessage($ex); - } catch (\Exception $ex) { - // Any other error - $error_msg = $ex->getMessage(); - } - - $this->setupFormErrorContext("category creation", $error_msg, $creationForm, $ex); - - // At this point, the form has error, and should be redisplayed. - return $this->renderList(); - } - - /** - * Load a category object for modification, and display the edit template. - * - * @return Symfony\Component\HttpFoundation\Response the response - */ - public function changeAction() - { - // Check current user authorization - if (null !== $response = $this->checkAuth("admin.categories.update")) return $response; - - // Load the category object - $category = CategoryQuery::create() - ->joinWithI18n($this->getCurrentEditionLocale()) - ->findOneById($this->getRequest()->get('category_id')); - - if ($category != null) { - - // Prepare the data that will hydrate the form - $data = array( - 'id' => $category->getId(), - 'locale' => $category->getLocale(), - 'title' => $category->getTitle(), - 'chapo' => $category->getChapo(), - 'description' => $category->getDescription(), - 'postscriptum' => $category->getPostscriptum(), - 'parent' => $category->getParent(), - 'visible' => $category->getVisible() ? true : false, - 'url' => $category->getUrl($this->getCurrentEditionLocale()) - // tbc !!! - ); - - // Setup the object form - $changeForm = new CategoryModificationForm($this->getRequest(), "form", $data); - - // Pass it to the parser - $this->getParserContext()->addForm($changeForm); - } - - // Render the edition template. - return $this->render('category-edit', $this->getTemplateArgs()); - } - - /** - * Save changes on a modified category object, and either go back to the category list, or stay on the edition page. - * - * @return Symfony\Component\HttpFoundation\Response the response - */ - public function saveChangeAction() - { - // Check current user authorization - if (null !== $response = $this->checkAuth("admin.categories.update")) return $response; - - $error_msg = false; - - // Create the form from the request - $changeForm = new CategoryModificationForm($this->getRequest()); - - // Get the category ID - $category_id = $this->getRequest()->get('category_id'); - - try { - - // Check the form against constraints violations - $form = $this->validateForm($changeForm, "POST"); - - // Get the form field values - $data = $form->getData(); - - $changeEvent = new CategoryUpdateEvent($data['id']); - - // Create and dispatch the change event - $changeEvent - ->setCategoryName($data['name']) - ->setLocale($data["locale"]) - ->setSymbol($data['symbol']) - ->setCode($data['code']) - ->setRate($data['rate']) - ; - - $this->dispatch(TheliaEvents::CATEGORY_UPDATE, $changeEvent); - - if (! $createEvent->hasCategory()) throw new \LogicException($this->getTranslator()->trans("No category was updated.")); - - // Log category modification - $changedObject = $changeEvent->getCategory(); - - $this->adminLogAppend(sprintf("Category %s (ID %s) modified", $changedObject->getTitle(), $changedObject->getId())); - - // If we have to stay on the same page, do not redirect to the succesUrl, - // just redirect to the edit page again. - if ($this->getRequest()->get('save_mode') == 'stay') { - $this->redirectToRoute( - "admin.categories.update", - array('category_id' => $category_id) + protected function redirectToListTemplate() { + $this->redirectToRoute( + 'admin.categories.default', + array('category_id' => $this->getRequest()->get('category_id', 0)) ); - } - - // Redirect to the success URL - $this->redirect($changeForm->getSuccessUrl()); - } catch (FormValidationException $ex) { - // Form cannot be validated - $error_msg = $this->createStandardFormValidationErrorMessage($ex); - } catch (\Exception $ex) { - // Any other error - $error_msg = $ex->getMessage(); - } - - $this->setupFormErrorContext("category modification", $error_msg, $changeForm, $ex); - - // At this point, the form has errors, and should be redisplayed. - return $this->render('category-edit', array('category_id' => $category_id)); } /** @@ -253,74 +187,41 @@ class CategoryController extends BaseAdminController // Check current user authorization if (null !== $response = $this->checkAuth("admin.categories.update")) return $response; - $changeEvent = new CategoryUpdateEvent($this->getRequest()->get('category_id', 0)); - - // Create and dispatch the change event - $changeEvent->setIsDefault(true); + $event = new CategoryToggleVisibilityEvent($this->getExistingObject()); try { - $this->dispatch(TheliaEvents::CATEGORY_SET_DEFAULT, $changeEvent); + $this->dispatch(TheliaEvents::CATEGORY_TOGGLE_VISIBILITY, $event); } catch (\Exception $ex) { // Any error return $this->errorPage($ex); } - $this->redirectToRoute('admin.categories.default'); + // Ajax response -> no action + return $this->nullResponse(); } - /** - * Update categoryposition - */ - public function updatePositionAction() + protected function performAdditionalDeleteAction($deleteEvent) { - // Check current user authorization - if (null !== $response = $this->checkAuth("admin.categories.update")) return $response; + // Redirect to parent category list + $this->redirectToRoute( + 'admin.categories.default', + array('category_id' => $deleteEvent->getCategory()->getParent()) + ); + } - try { - $mode = $this->getRequest()->get('mode', null); + protected function performAdditionalUpdatePositionAction($event) + { - if ($mode == 'up') - $mode = CategoryUpdatePositionEvent::POSITION_UP; - else if ($mode == 'down') - $mode = CategoryUpdatePositionEvent::POSITION_DOWN; - else - $mode = CategoryUpdatePositionEvent::POSITION_ABSOLUTE; + $category = CategoryQuery::create()->findPk($event->getObjectId()); - $position = $this->getRequest()->get('position', null); - - $event = new CategoryUpdatePositionEvent( - $this->getRequest()->get('category_id', null), - $mode, - $this->getRequest()->get('position', null) + if ($category != null) { + // Redirect to parent category list + $this->redirectToRoute( + 'admin.categories.default', + array('category_id' => $category->getParent()) ); - - $this->dispatch(TheliaEvents::CATEGORY_UPDATE_POSITION, $event); - } catch (\Exception $ex) { - // Any error - return $this->errorPage($ex); } - $this->redirectToRoute('admin.categories.default'); - } - - /** - * Delete a category object - * - * @return Symfony\Component\HttpFoundation\Response the response - */ - public function deleteAction() - { - // Check current user authorization - if (null !== $response = $this->checkAuth("admin.categories.delete")) return $response; - - // Get the category id, and dispatch the deleted request - $event = new CategoryDeleteEvent($this->getRequest()->get('category_id')); - - $this->dispatch(TheliaEvents::CATEGORY_DELETE, $event); - - if ($event->hasCategory()) - $this->adminLogAppend(sprintf("Category %s (ID %s) deleted", $event->getCategory()->getTitle(), $event->getCategory()->getId())); - - $this->redirectToRoute('admin.categories.default'); + return null; } } diff --git a/core/lib/Thelia/Controller/Admin/ConfigController.php b/core/lib/Thelia/Controller/Admin/ConfigController.php index ff0e4bb39..8701710b0 100644 --- a/core/lib/Thelia/Controller/Admin/ConfigController.php +++ b/core/lib/Thelia/Controller/Admin/ConfigController.php @@ -33,7 +33,7 @@ use Thelia\Form\ConfigCreationForm; use Thelia\Core\Event\UpdatePositionEvent; /** - * Manages variables sent by mail + * Manages variables * * @author Franck Allimant */ diff --git a/core/lib/Thelia/Controller/Admin/CurrencyController.php b/core/lib/Thelia/Controller/Admin/CurrencyController.php index 4f3fdaaea..f0081d698 100644 --- a/core/lib/Thelia/Controller/Admin/CurrencyController.php +++ b/core/lib/Thelia/Controller/Admin/CurrencyController.php @@ -33,7 +33,7 @@ use Thelia\Form\CurrencyCreationForm; use Thelia\Core\Event\UpdatePositionEvent; /** - * Manages currencies sent by mail + * Manages currencies * * @author Franck Allimant */ diff --git a/core/lib/Thelia/Controller/Admin/FeatureAvController.php b/core/lib/Thelia/Controller/Admin/FeatureAvController.php index 25c7a5495..fc6571ccc 100644 --- a/core/lib/Thelia/Controller/Admin/FeatureAvController.php +++ b/core/lib/Thelia/Controller/Admin/FeatureAvController.php @@ -33,7 +33,7 @@ use Thelia\Form\FeatureAvCreationForm; use Thelia\Core\Event\UpdatePositionEvent; /** - * Manages features-av sent by mail + * Manages features-av * * @author Franck Allimant */ diff --git a/core/lib/Thelia/Controller/Admin/FeatureController.php b/core/lib/Thelia/Controller/Admin/FeatureController.php index 92cb89d33..f81f55919 100644 --- a/core/lib/Thelia/Controller/Admin/FeatureController.php +++ b/core/lib/Thelia/Controller/Admin/FeatureController.php @@ -37,7 +37,7 @@ use Thelia\Core\Event\FeatureAvUpdateEvent; use Thelia\Core\Event\FeatureEvent; /** - * Manages features sent by mail + * Manages features * * @author Franck Allimant */ diff --git a/core/lib/Thelia/Controller/Admin/TemplateController.php b/core/lib/Thelia/Controller/Admin/TemplateController.php index 3685a359a..c9e30612c 100644 --- a/core/lib/Thelia/Controller/Admin/TemplateController.php +++ b/core/lib/Thelia/Controller/Admin/TemplateController.php @@ -41,7 +41,7 @@ use Thelia\Core\Event\TemplateAddFeatureEvent; use Thelia\Core\Event\TemplateDeleteFeatureEvent; /** - * Manages templates sent by mail + * Manages product templates * * @author Franck Allimant */ diff --git a/core/lib/Thelia/Core/Event/CategoryCreateEvent.php b/core/lib/Thelia/Core/Event/CategoryCreateEvent.php index 5a687217c..41529019c 100644 --- a/core/lib/Thelia/Core/Event/CategoryCreateEvent.php +++ b/core/lib/Thelia/Core/Event/CategoryCreateEvent.php @@ -28,13 +28,7 @@ class CategoryCreateEvent extends CategoryEvent protected $title; protected $parent; protected $locale; - - public function __construct($title, $parent, $locale) - { - $this->title = $title; - $this->parent = $parent; - $this->locale = $locale; - } + protected $visible; public function getTitle() { @@ -71,4 +65,16 @@ class CategoryCreateEvent extends CategoryEvent return $this; } + + public function getVisible() + { + return $this->visible; + } + + public function setVisible($visible) + { + $this->visible = $visible; + + return $this; + } } diff --git a/core/lib/Thelia/Core/Event/CategoryToggleVisibilityEvent.php b/core/lib/Thelia/Core/Event/CategoryToggleVisibilityEvent.php new file mode 100644 index 000000000..f90378e38 --- /dev/null +++ b/core/lib/Thelia/Core/Event/CategoryToggleVisibilityEvent.php @@ -0,0 +1,28 @@ +. */ +/* */ +/*************************************************************************************/ + +namespace Thelia\Core\Event; + +class CategoryToggleVisibilityEvent extends CategoryEvent +{ +} diff --git a/core/lib/Thelia/Core/Event/CategoryUpdateEvent.php b/core/lib/Thelia/Core/Event/CategoryUpdateEvent.php index 44e760549..f5f775a22 100644 --- a/core/lib/Thelia/Core/Event/CategoryUpdateEvent.php +++ b/core/lib/Thelia/Core/Event/CategoryUpdateEvent.php @@ -32,7 +32,6 @@ class CategoryUpdateEvent extends CategoryCreateEvent protected $postscriptum; protected $url; - protected $visibility; protected $parent; public function __construct($category_id) @@ -100,18 +99,6 @@ class CategoryUpdateEvent extends CategoryCreateEvent return $this; } - public function getVisibility() - { - return $this->visibility; - } - - public function setVisibility($visibility) - { - $this->visibility = $visibility; - - return $this; - } - public function getParent() { return $this->parent; diff --git a/core/lib/Thelia/Core/Event/TheliaEvents.php b/core/lib/Thelia/Core/Event/TheliaEvents.php index 2867762aa..a305f134a 100755 --- a/core/lib/Thelia/Core/Event/TheliaEvents.php +++ b/core/lib/Thelia/Core/Event/TheliaEvents.php @@ -145,50 +145,21 @@ final class TheliaEvents // -- END ADDRESS MANAGEMENT --------------------------------------------------------- - /** - * Sent once the category creation form has been successfully validated, and before category insertion in the database. - */ - const BEFORE_CREATECATEGORY = "action.before_createcategory"; + // -- Categories management ----------------------------------------------- - /** - * Create, change or delete a category - */ - const CATEGORY_CREATE = "action.createCategory"; - const CATEGORY_UPDATE = "action.updateCategory"; - const CATEGORY_DELETE = "action.deleteCategory"; - - /** - * Toggle category visibility - */ + const CATEGORY_CREATE = "action.createCategory"; + const CATEGORY_UPDATE = "action.updateCategory"; + const CATEGORY_DELETE = "action.deleteCategory"; const CATEGORY_TOGGLE_VISIBILITY = "action.toggleCategoryVisibility"; + const CATEGORY_UPDATE_POSITION = "action.updateCategoryPosition"; - /** - * Change category position - */ - const CATEGORY_CHANGE_POSITION = "action.updateCategoryPosition"; - - /** - * Sent just after a successful insert of a new category in the database. - */ + const BEFORE_CREATECATEGORY = "action.before_createcategory"; const AFTER_CREATECATEGORY = "action.after_createcategory"; - /** - * Sent befonre deleting a category - */ - const BEFORE_DELETECATEGORY = "action.before_deletecategory"; - /** - * Sent just after a successful delete of a category from the database. - */ + const BEFORE_DELETECATEGORY = "action.before_deletecategory"; const AFTER_DELETECATEGORY = "action.after_deletecategory"; - /** - * Sent just before a successful change of a category in the database. - */ const BEFORE_UPDATECATEGORY = "action.before_updateCategory"; - - /** - * Sent just after a successful change of a category in the database. - */ const AFTER_UPDATECATEGORY = "action.after_updateCategory"; /** diff --git a/core/lib/Thelia/Core/Template/Loop/CategoryTree.php b/core/lib/Thelia/Core/Template/Loop/CategoryTree.php index afcd0410e..712767954 100755 --- a/core/lib/Thelia/Core/Template/Loop/CategoryTree.php +++ b/core/lib/Thelia/Core/Template/Loop/CategoryTree.php @@ -59,7 +59,7 @@ class CategoryTree extends BaseI18nLoop } // changement de rubrique - protected function buildCategoryTree($parent, $visible, $level, $max_level, array $exclude, LoopResult &$loopResult) + protected function buildCategoryTree($parent, $visible, $level, $max_level, $exclude, LoopResult &$loopResult) { if ($level > $max_level) return; @@ -73,7 +73,7 @@ class CategoryTree extends BaseI18nLoop if ($visible != BooleanOrBothType::ANY) $search->filterByVisible($visible); - $search->filterById($exclude, Criteria::NOT_IN); + if ($exclude != null) $search->filterById($exclude, Criteria::NOT_IN); $search->orderByPosition(Criteria::ASC); diff --git a/core/lib/Thelia/Form/CategoryCreationForm.php b/core/lib/Thelia/Form/CategoryCreationForm.php index 5dce6a049..172b09ee6 100755 --- a/core/lib/Thelia/Form/CategoryCreationForm.php +++ b/core/lib/Thelia/Form/CategoryCreationForm.php @@ -39,7 +39,8 @@ class CategoryCreationForm extends BaseForm "for" => "title" ) )) - ->add("parent", "integer", array( + ->add("parent", "text", array( + "label" => Translator::getInstance()->trans("Parent category *"), "constraints" => array( new NotBlank() ) @@ -49,6 +50,9 @@ class CategoryCreationForm extends BaseForm new NotBlank() ) )) + ->add("visible", "integer", array( + "label" => Translator::getInstance()->trans("This category is online on the front office.") + )) ; } diff --git a/core/lib/Thelia/Form/CategoryModificationForm.php b/core/lib/Thelia/Form/CategoryModificationForm.php index d9de36d16..42b5893c1 100644 --- a/core/lib/Thelia/Form/CategoryModificationForm.php +++ b/core/lib/Thelia/Form/CategoryModificationForm.php @@ -24,6 +24,7 @@ namespace Thelia\Form; use Symfony\Component\Validator\Constraints\GreaterThan; use Thelia\Core\Translation\Translator; +use Symfony\Component\Validator\Constraints\NotBlank; class CategoryModificationForm extends CategoryCreationForm { @@ -36,12 +37,13 @@ class CategoryModificationForm extends CategoryCreationForm $this->formBuilder ->add("id", "hidden", array("constraints" => array(new GreaterThan(array('value' => 0))))) - ->add("visible", "checkbox", array( - "label" => Translator::getInstance()->trans("This category is online on the front office.") + ->add("url", "text", array( + "label" => Translator::getInstance()->trans("Rewriten URL *"), + "constraints" => array(new NotBlank()) )) ; - // Add standard description fields + // Add standard description fields, excluding title and locale, which a re defined in parent class $this->addStandardDescFields(array('title', 'locale')); } diff --git a/core/lib/Thelia/Model/Category.php b/core/lib/Thelia/Model/Category.php index ced10c94b..5533eaf42 100755 --- a/core/lib/Thelia/Model/Category.php +++ b/core/lib/Thelia/Model/Category.php @@ -28,26 +28,6 @@ class Category extends BaseCategory return URL::getInstance()->retrieve('category', $this->getId(), $locale)->toString(); } - /** - * Create a new category. - * - * @param string $title the category title - * @param int $parent the ID of the parent category - * @param string $locale the locale of the title - */ - public function create($title, $parent, $locale) - { - $this - ->setLocale($locale) - ->setTitle($title) - ->setParent($parent) - ->setVisible(1) - ->setPosition($this->getNextPosition($parent)) - ; - - $this->save(); - } - /** * * count all products for current category and sub categories @@ -73,6 +53,8 @@ class Category extends BaseCategory public function preInsert(ConnectionInterface $con = null) { + $this->setPosition($this->getNextPosition($this->parent)); + $this->dispatchEvent(TheliaEvents::BEFORE_CREATECATEGORY, new CategoryEvent($this)); return true; @@ -98,6 +80,8 @@ class Category extends BaseCategory public function preDelete(ConnectionInterface $con = null) { $this->dispatchEvent(TheliaEvents::BEFORE_DELETECATEGORY, new CategoryEvent($this)); + + return true; } public function postDelete(ConnectionInterface $con = null) diff --git a/templates/admin/default/assets/less/thelia/thelia.less b/templates/admin/default/assets/less/thelia/thelia.less index 50cd9bde6..6dc130918 100644 --- a/templates/admin/default/assets/less/thelia/thelia.less +++ b/templates/admin/default/assets/less/thelia/thelia.less @@ -34,7 +34,7 @@ .topbar { - background: url("@{imgDir}/top.jpg") repeat-x; + background: url("@{imgDir}/top.jpg") repeat-x; font-weight: bold; .version-info { @@ -202,7 +202,7 @@ border-bottom: 2px solid #A5CED8; margin-bottom: 0.5em; } - + // The action bar on the right .actions { text-align: right; @@ -217,6 +217,10 @@ text-transform: none; } } + + .inner-actions { + margin-top: 0.5em; + } } // The overall form container diff --git a/templates/admin/default/categories.html b/templates/admin/default/categories.html index 6fe06f8bc..32b9e6cba 100755 --- a/templates/admin/default/categories.html +++ b/templates/admin/default/categories.html @@ -1,396 +1,260 @@ {extends file="admin-layout.tpl"} -{block name="page-title"}{intl l='Catalog'}{/block} +{block name="page-title"}{intl l='Categories'}{/block} -{block name="check-permissions"}admin.catalog.view{/block} +{block name="check-permissions"}admin.categories.view{/block} {block name="main-content"} -
-
+
- {include file="includes/catalog-breadcrumb.html"} +
- {module_include location='catalog_top'} + {include file="includes/catalog-breadcrumb.html"} -
-
-
- - - {module_include location='catalog_bottom'} - - + {module_include location='category_list_row'} - {* Adding a new Category *} + + + + + + + {/loop} + + {/ifloop} + + {elseloop rel="category_list"} + + + + + + {/elseloop} +
- {* display parent category name, and get current cat ID *} - {loop name="category_title" type="category" visible="*" id=$current_category_id} - {intl l="Categories in %cat" cat=$TITLE} - {$cat_id = $ID} - {/loop} - {elseloop rel="category_title"} - {intl l="Top level categories"} - {/elseloop} + {module_include location='categories_top'} - {module_include location='category_list_caption'} +
+
+
+ + + {module_include location='category_list_caption'} - {ifloop rel="category_list"} - - - + {loop type="auth" name="can_create" roles="ADMIN" permissions="admin.categories.create"} + + + + {/loop} + - + {ifloop rel="category_list"} + + + - + - {module_include location='category_list_header'} + - + {module_include location='category_list_header'} - + - - - + - - {loop name="category_list" type="category" visible="*" parent=$current_category_id order=$category_order backend_context="1" lang=$lang_id} - - + + + - + + {loop name="category_list" type="category" visible="*" parent=$category_id order=$category_order backend_context="1" lang=$lang_id} + + - - - {module_include location='category_list_row'} - - - - - - - - {/loop} - - {/ifloop} - - {elseloop rel="category_list"} - - - - - - {/elseloop} -
+ {* display parent category name, and get current cat ID *} + {loop name="category_title" type="category" visible="*" id=$category_id} + {intl l="Categories in %cat" cat=$TITLE} + {$cat_id = $ID} + {/loop} + {elseloop rel="category_title"} + {intl l="Top level categories"} + {/elseloop} - {loop type="auth" name="can_create" roles="ADMIN" permissions="admin.categories.create"} - - - - {/loop} -
- {admin_sortable_header - current_order=$category_order - order='id' - reverse_order='id_reverse' - path={url path='/admin/catalog' id_category=$current_category_id} - label="{intl l='ID'}" - } -  
+ {admin_sortable_header + current_order=$category_order + order='id' + reverse_order='id_reverse' + path={url path='/admin/categories' id_category=$category_id} + request_parameter_name='category_order' + label="{intl l='ID'}" + } + - {admin_sortable_header - current_order=$category_order - order='alpha' - reverse_order='alpha_reverse' - path={url path='/admin/catalog' id_category=$current_category_id} - label="{intl l='Category title'}" - } -   + {admin_sortable_header + current_order=$category_order + order='alpha' + reverse_order='alpha_reverse' + path={url path='/admin/categories' id_category=$category_id} + request_parameter_name='category_order' + label="{intl l='Category title'}" + } + - {admin_sortable_header - current_order=$category_order - order='visible' - reverse_order='visible_reverse' - path={url path='/admin/catalog' id_category=$current_category_id} - label="{intl l='Online'}" - } - - {admin_sortable_header - current_order=$category_order - order='manual' - reverse_order='manual_reverse' - path={url path='/admin/catalog' id_category=$current_category_id} - label="{intl l='Position'}" - } - + {admin_sortable_header + current_order=$category_order + order='visible' + reverse_order='visible_reverse' + path={url path='/admin/categories' id_category=$category_id} + request_parameter_name='category_order' + label="{intl l='Online'}" + } + {intl l='Actions'}
+ {admin_sortable_header + current_order=$category_order + order='manual' + reverse_order='manual_reverse' + path={url path='/admin/categories' id_category=$category_id} + request_parameter_name='category_order' + label="{intl l='Position'}" + } +
{$ID}{intl l='Actions'}
- {loop type="image" name="cat_image" source="category" source_id="$ID" limit="1" width="50" height="50" resize_mode="crop" backend_context="1"} - {$TITLE} - {/loop} -
{$ID} - - {$TITLE} - - - {loop type="auth" name="can_change" roles="ADMIN" permissions="admin.categories.edit"} -
- -
- {/loop} - - {elseloop rel="can_change"} -
- -
- {/elseloop} - 		- {admin_position_block - permission="admin.categories.edit" - path={url path='admin/category/update-position' category_id=$ID} - url_parameter="category_id" - in_place_edit_class="categoryPositionChange" - position=$POSITION - id=$ID - } - -
- - - {loop type="auth" name="can_change" roles="ADMIN" permissions="admin.categories.edit"} - - {/loop} - - {loop type="auth" name="can_delete" roles="ADMIN" permissions="admin.categories.delete"} - - {/loop} -
-
-
- {loop type="auth" name="can_create" roles="ADMIN" permissions="admin.categories.create"} - {intl l="This category has no sub-categories. To create a new one, click the + button above."} - {/loop} - - {elseloop rel="can_create"} - {intl l="This category has no sub-categories."} - {/elseloop} -
-
-
-
-
- -
-
-
- - - - {ifloop rel="product_list"} - - - - - - - - - - - - - - - - {loop name="product_list" type="product" category=$current_category_id order="manual"} - - - - - - - - {module_include location='product_list_row'} - - - - - - - - {/loop} - - {/ifloop} + - {elseloop rel="product_list"} - - - - - - {/elseloop} -
- {* display parent category name *} - {loop name="category_title" type="category" visible="*" id=$current_category_id} - {intl l="Products in %cat" cat=$TITLE} - {/loop} - - {elseloop rel="category_title"} - {intl l="Top level Products"} - {/elseloop} - - {module_include location='product_list_caption'} - - - - -
- {admin_sortable_header - current_order=$product_order - order='id' - reverse_order='id_reverse' - path={url path='/admin/product' category_id=$current_category_id} - label="{intl l='ID'}" - } - -   - {admin_sortable_header - current_order=$product_order - order='ref' - reverse_order='ref_reverse' - path={url path='/admin/product' category_id=$current_category_id} - label="{intl l='Reference'}" - } - - {admin_sortable_header - current_order=$product_order - order='alpha' - reverse_order='alpha_reverse' - path={url path='/admin/product' category_id=$current_category_id} - label="{intl l='Product title'}" - } - - {module_include location='product_list_header'} - - - {admin_sortable_header - current_order=$product_order - order='visible' - reverse_order='visible_reverse' - path={url path='/admin/product' category_id=$current_category_id} - label="{intl l='Online'}" - } - - {admin_sortable_header - current_order=$product_order - order='manual' - reverse_order='manual_reverse' - path={url path='/admin/product' category_id=$current_category_id} - label="{intl l='Position'}" - } -  
{$ID} - {loop type="image" name="cat_image" source="product" source_id="$ID" limit="1" width="50" height="50" resize_mode="crop" backend_context="1"} - - {$TITLE} - - {/loop} - - {$REF}{$TITLE} - {loop type="auth" name="can_change" roles="ADMIN" permissions="admin.products.edit"} -
- -
- {/loop} - - {elseloop rel="can_change"} -
- -
- {/elseloop} - 		- {admin_position_block - permission="admin.product.edit" - path={url path='admin/product' category_id=$ID} - url_parameter="product_id" - in_place_edit_class="productPositionChange" - position=$POSITION - id=$ID - } - -
- {loop type="auth" name="can_change" roles="ADMIN" permissions="admin.product.edit"} - - {/loop} - - {loop type="auth" name="can_change" roles="ADMIN" permissions="admin.product.delete"} - +
+ {loop type="image" name="cat_image" source="category" source_id="$ID" limit="1" width="50" height="50" resize_mode="crop" backend_context="1"} + {$TITLE} {/loop} - -
{intl l="This category doesn't have any products. To add a new product, click the + button above."}
-
-
-
+
+ + {$TITLE} + + + {loop type="auth" name="can_change" roles="ADMIN" permissions="admin.categories.edit"} +
+ +
+ {/loop} - {form name="thelia.admin.category.creation"} + {elseloop rel="can_change"} +
+ +
+ {/elseloop} + 		+ {admin_position_block + permission="admin.categories.edit" + path={url path='admin/categories/update-position' category_id=$ID} + url_parameter="category_id" + in_place_edit_class="categoryPositionChange" + position=$POSITION + id=$ID + } + +
+ + + {loop type="auth" name="can_change" roles="ADMIN" permissions="admin.categories.edit"} + + {/loop} + + {loop type="auth" name="can_delete" roles="ADMIN" permissions="admin.categories.delete"} + + {/loop} +
+
+
+ {loop type="auth" name="can_create" roles="ADMIN" permissions="admin.categories.create"} + {intl l="This category has no sub-categories. To create a new one, click the + button above."} + {/loop} + + {elseloop rel="can_create"} + {intl l="This category has no sub-categories."} + {/elseloop} +
+
+
+
+
+ + {module_include location='categories_bottom'} + +
+
+ + + {* Adding a new category *} + + {form name="thelia.admin.category.creation"} {* Capture the dialog body, to pass it to the generic dialog *} {capture "category_creation_dialog"} {form_hidden_fields form=$form} - {form_field form=$form field='success_url'} - {* on success, redirect to the edition page, _ID_ is replaced with the created object ID, see controller *} - - {/form_field} + {form_field form=$form field='success_url'} + {* on success, redirect to the edition page, _ID_ is replaced with the created object ID, see controller *} + + {/form_field} - {form_field form=$form field='parent'} - - {/form_field} + {form_field form=$form field='parent'} + + {/form_field} - {form_field form=$form field='title'} -
- + {form_field form=$form field='title'} +
+ + {loop type="lang" name="default-lang" default_only="1"} +
+ + $TITLE +
- {loop type="lang" name="default-lang" default_only="1"} +
{intl l='Enter here the category name in the default language (%title)' title="$TITLE"}
-
- - $TITLE -
+ {* Switch edition to the current locale *} + -
{intl l='Enter here the category name in the default language (%title)' title="$TITLE"}
+ {form_field form=$form field='locale'} + + {/form_field} + {/loop} +
+ {/form_field} - {* Switch edition to the current locale *} - - - {form_field form=$form field='locale'} - - {/form_field} - {/loop} -
- {/form_field} + {form_field form=$form field='visible'} +
+
+ +
+
+ {/form_field} {module_include location='category_create_form'} - {/capture} + {/capture} - {include - file = "includes/generic-create-dialog.html" + {include + file = "includes/generic-create-dialog.html" - dialog_id = "add_category_dialog" - dialog_title = {intl l="Create a new category"} - dialog_body = {$smarty.capture.category_creation_dialog nofilter} + dialog_id = "category_creation_dialog" + dialog_title = {intl l="Create a new category"} + dialog_body = {$smarty.capture.category_creation_dialog nofilter} - dialog_ok_label = {intl l="Create this category"} - dialog_cancel_label = {intl l="Cancel"} + dialog_ok_label = {intl l="Create this category"} - form_action = {url path='/admin/categories/create'} - form_enctype = {form_enctype form=$form} - form_error_message = $form_error_message - } + form_action = {url path='/admin/categories/create'} + form_enctype = {form_enctype form=$form} + form_error_message = $form_error_message + } {/form} - {* Delete category confirmation dialog *} + + {* Delete confirmation dialog *} {capture "category_delete_dialog"} - - + {module_include location='category_delete_form'} @@ -399,9 +263,9 @@ {include file = "includes/generic-confirm-dialog.html" - dialog_id = "delete_category_dialog" - dialog_title = {intl l="Delete a category"} - dialog_message = {intl l="Do you really want to delete this category, and all its contents ?"} + dialog_id = "category_delete_dialog" + dialog_title = {intl l="Delete category"} + dialog_message = {intl l="Do you really want to delete this category and all its content ?"} form_action = {url path='/admin/categories/delete'} form_content = {$smarty.capture.category_delete_dialog nofilter} @@ -410,108 +274,76 @@ {block name="javascript-initialization"} - {javascripts file='assets/js/bootstrap-switch/bootstrap-switch.js'} - - {/javascripts} + {javascripts file='assets/js/bootstrap-switch/bootstrap-switch.js'} + + {/javascripts} - {javascripts file='assets/js/bootstrap-editable/bootstrap-editable.js'} - - {/javascripts} + {javascripts file='assets/js/bootstrap-editable/bootstrap-editable.js'} + + {/javascripts} - + {/block} \ No newline at end of file diff --git a/templates/admin/default/category-edit.html b/templates/admin/default/category-edit.html index e01849475..9fa9e18e4 100755 --- a/templates/admin/default/category-edit.html +++ b/templates/admin/default/category-edit.html @@ -11,7 +11,7 @@ {include file="includes/catalog-breadcrumb.html"}
- {loop name="category_edit" type="category" visible="*" id="{$current_category_id}" backend_context="1" lang="$edit_language_id"} + {loop name="category_edit" type="category" visible="*" id="{$category_id}" backend_context="1" lang="$edit_language_id"}
@@ -25,189 +25,126 @@
- +
+
-
- -
+
-
-
-
+
- {include file="includes/inner-form-toolbar.html" close_url="{url path='admin/catalog/category/edit' category_id=$current_category_id}"} +
-
-
-
- + {form name="thelia.admin.category.modification"} + -
- -
-
+ {include file="includes/inner-form-toolbar.html" close_url="{url path='/admin/categories' category_id=$category_id}"} -
- + {* Be sure to get the category ID, even if the form could not be validated *} + -
- -
-
+ {form_hidden_fields form=$form} -
- + {form_field form=$form field='success_url'} + + {/form_field} -
- + {form_field form=$form field='locale'} + + {/form_field} -
-
+ {if $form_error}
{$form_error_message}
{/if} -
- + {include file="includes/standard-description-form-fields.html"} -
- -
-
+ {form_field form=$form field='url'} +
+ -
- + +
+ {/form_field} -
-
- - {intl l='Use default'} -
-
{intl l="The rewritten URL to the category page. Click \"Use Default\" button to use the default URL. Use only digits, letters, - and _ characters."}
-
-
+
+
+ {form_field form=$form field='parent'} +
-
-
+ -
-
-
-   -
-

{intl l='Category created on %date_create. Last modification: %date_change' date_create="{format_date date=$CREATE_DATE}" date_change="{format_date date=$UPDATE_DATE}"}}

-
-
-
-
+ +
+ {/form_field} +
+ +
+ {form_field form=$form field='visible'} +
+ +
+ +
+
+ {/form_field} +
+
-
-
- - -
- -
-
-
- -
-
- - -
- -
-
-
-
- -
- - -
- +   +
+

{intl l='Category created on %date_create. Last modification: %date_change' date_create="{format_date date=$CREATE_DATE}" date_change="{format_date date=$UPDATE_DATE}"}

-
+
-
-
-
+ + {/form} +
+
-
-

Images

-
+
+ klljkmk +
-
-

Documents

-
+
+
-
-

Modules

-
+
+
-
-
- - {/loop} +
+
+
+
+
+ {/loop}
@@ -217,10 +154,6 @@ + + + \ No newline at end of file diff --git a/web/install/header.php b/web/install/header.php new file mode 100644 index 000000000..983fa51ce --- /dev/null +++ b/web/install/header.php @@ -0,0 +1,59 @@ +. */ +/* */ +/*************************************************************************************/ +session_start(); +include 'bootstrap.php'; +?> + + + + Installation + + + + + +
+
+
+
+
Version undefined
+
+
+
+
+
+
+
+
+
+

Thelia installation wizard

+
+
    +
  • 1Welcome
    • +
  • 2Checking permissions
    • +
  • 3Database connection
    • +
  • 4Database selection
    • +
  • 5General information
    • +
  • 6Thanks
    • +
+
\ No newline at end of file diff --git a/web/install/index.php b/web/install/index.php new file mode 100644 index 000000000..884ca11b7 --- /dev/null +++ b/web/install/index.php @@ -0,0 +1,39 @@ +. */ +/* */ +/*************************************************************************************/ +?> + +
+

+Welcome in the Thelia installation wizard. +

+

+We will guide you throughout this process to install any application on your system. +

+
+
+ Continue +
+ \ No newline at end of file diff --git a/web/install/permission.php b/web/install/permission.php new file mode 100644 index 000000000..fca995457 --- /dev/null +++ b/web/install/permission.php @@ -0,0 +1,56 @@ +. */ +/* */ +/*************************************************************************************/ +?> +getContainer()->get('thelia.translator')); +$isValid = $checkPermission->exec(); +$validationMessage = $checkPermission->getValidationMessages(); +$_SESSION['install']['return_step'] = 'permission.php'; +$_SESSION['install']['continue'] = $isValid; +$_SESSION['install']['current_step'] = 'permission.php'; +$_SESSION['install']['step'] = 2; +?> +
+

Checking permissions

+
    + $data): ?> +
  • + + +
    • + +
+ +
+
+ + Continue + + refresh + +
+ \ No newline at end of file diff --git a/web/install/script.js b/web/install/script.js new file mode 100644 index 000000000..b26e7612e --- /dev/null +++ b/web/install/script.js @@ -0,0 +1,1999 @@ +/** + * bootstrap.js v3.0.0 by @fat and @mdo + * Copyright 2013 Twitter Inc. + * http://www.apache.org/licenses/LICENSE-2.0 + */ +if (!jQuery) { throw new Error("Bootstrap requires jQuery") } + +/* ======================================================================== + * Bootstrap: transition.js v3.0.0 + * http://twbs.github.com/bootstrap/javascript.html#transitions + * ======================================================================== + * Copyright 2013 Twitter, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ======================================================================== */ + + ++function ($) { "use strict"; + + // CSS TRANSITION SUPPORT (Shoutout: http://www.modernizr.com/) + // ============================================================ + + function transitionEnd() { + var el = document.createElement('bootstrap') + + var transEndEventNames = { + 'WebkitTransition' : 'webkitTransitionEnd' + , 'MozTransition' : 'transitionend' + , 'OTransition' : 'oTransitionEnd otransitionend' + , 'transition' : 'transitionend' + } + + for (var name in transEndEventNames) { + if (el.style[name] !== undefined) { + return { end: transEndEventNames[name] } + } + } + } + + // http://blog.alexmaccaw.com/css-transitions + $.fn.emulateTransitionEnd = function (duration) { + var called = false, $el = this + $(this).one($.support.transition.end, function () { called = true }) + var callback = function () { if (!called) $($el).trigger($.support.transition.end) } + setTimeout(callback, duration) + return this + } + + $(function () { + $.support.transition = transitionEnd() + }) + +}(window.jQuery); + +/* ======================================================================== + * Bootstrap: alert.js v3.0.0 + * http://twbs.github.com/bootstrap/javascript.html#alerts + * ======================================================================== + * Copyright 2013 Twitter, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ======================================================================== */ + + ++function ($) { "use strict"; + + // ALERT CLASS DEFINITION + // ====================== + + var dismiss = '[data-dismiss="alert"]' + var Alert = function (el) { + $(el).on('click', dismiss, this.close) + } + + Alert.prototype.close = function (e) { + var $this = $(this) + var selector = $this.attr('data-target') + + if (!selector) { + selector = $this.attr('href') + selector = selector && selector.replace(/.*(?=#[^\s]*$)/, '') // strip for ie7 + } + + var $parent = $(selector) + + if (e) e.preventDefault() + + if (!$parent.length) { + $parent = $this.hasClass('alert') ? $this : $this.parent() + } + + $parent.trigger(e = $.Event('close.bs.alert')) + + if (e.isDefaultPrevented()) return + + $parent.removeClass('in') + + function removeElement() { + $parent.trigger('closed.bs.alert').remove() + } + + $.support.transition && $parent.hasClass('fade') ? + $parent + .one($.support.transition.end, removeElement) + .emulateTransitionEnd(150) : + removeElement() + } + + + // ALERT PLUGIN DEFINITION + // ======================= + + var old = $.fn.alert + + $.fn.alert = function (option) { + return this.each(function () { + var $this = $(this) + var data = $this.data('bs.alert') + + if (!data) $this.data('bs.alert', (data = new Alert(this))) + if (typeof option == 'string') data[option].call($this) + }) + } + + $.fn.alert.Constructor = Alert + + + // ALERT NO CONFLICT + // ================= + + $.fn.alert.noConflict = function () { + $.fn.alert = old + return this + } + + + // ALERT DATA-API + // ============== + + $(document).on('click.bs.alert.data-api', dismiss, Alert.prototype.close) + +}(window.jQuery); + +/* ======================================================================== + * Bootstrap: button.js v3.0.0 + * http://twbs.github.com/bootstrap/javascript.html#buttons + * ======================================================================== + * Copyright 2013 Twitter, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ======================================================================== */ + + ++function ($) { "use strict"; + + // BUTTON PUBLIC CLASS DEFINITION + // ============================== + + var Button = function (element, options) { + this.$element = $(element) + this.options = $.extend({}, Button.DEFAULTS, options) + } + + Button.DEFAULTS = { + loadingText: 'loading...' + } + + Button.prototype.setState = function (state) { + var d = 'disabled' + var $el = this.$element + var val = $el.is('input') ? 'val' : 'html' + var data = $el.data() + + state = state + 'Text' + + if (!data.resetText) $el.data('resetText', $el[val]()) + + $el[val](data[state] || this.options[state]) + + // push to event loop to allow forms to submit + setTimeout(function () { + state == 'loadingText' ? + $el.addClass(d).attr(d, d) : + $el.removeClass(d).removeAttr(d); + }, 0) + } + + Button.prototype.toggle = function () { + var $parent = this.$element.closest('[data-toggle="buttons"]') + + if ($parent.length) { + var $input = this.$element.find('input') + .prop('checked', !this.$element.hasClass('active')) + .trigger('change') + if ($input.prop('type') === 'radio') $parent.find('.active').removeClass('active') + } + + this.$element.toggleClass('active') + } + + + // BUTTON PLUGIN DEFINITION + // ======================== + + var old = $.fn.button + + $.fn.button = function (option) { + return this.each(function () { + var $this = $(this) + var data = $this.data('bs.button') + var options = typeof option == 'object' && option + + if (!data) $this.data('bs.button', (data = new Button(this, options))) + + if (option == 'toggle') data.toggle() + else if (option) data.setState(option) + }) + } + + $.fn.button.Constructor = Button + + + // BUTTON NO CONFLICT + // ================== + + $.fn.button.noConflict = function () { + $.fn.button = old + return this + } + + + // BUTTON DATA-API + // =============== + + $(document).on('click.bs.button.data-api', '[data-toggle^=button]', function (e) { + var $btn = $(e.target) + if (!$btn.hasClass('btn')) $btn = $btn.closest('.btn') + $btn.button('toggle') + e.preventDefault() + }) + +}(window.jQuery); + +/* ======================================================================== + * Bootstrap: carousel.js v3.0.0 + * http://twbs.github.com/bootstrap/javascript.html#carousel + * ======================================================================== + * Copyright 2012 Twitter, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ======================================================================== */ + + ++function ($) { "use strict"; + + // CAROUSEL CLASS DEFINITION + // ========================= + + var Carousel = function (element, options) { + this.$element = $(element) + this.$indicators = this.$element.find('.carousel-indicators') + this.options = options + this.paused = + this.sliding = + this.interval = + this.$active = + this.$items = null + + this.options.pause == 'hover' && this.$element + .on('mouseenter', $.proxy(this.pause, this)) + .on('mouseleave', $.proxy(this.cycle, this)) + } + + Carousel.DEFAULTS = { + interval: 5000 + , pause: 'hover' + , wrap: true + } + + Carousel.prototype.cycle = function (e) { + e || (this.paused = false) + + this.interval && clearInterval(this.interval) + + this.options.interval + && !this.paused + && (this.interval = setInterval($.proxy(this.next, this), this.options.interval)) + + return this + } + + Carousel.prototype.getActiveIndex = function () { + this.$active = this.$element.find('.item.active') + this.$items = this.$active.parent().children() + + return this.$items.index(this.$active) + } + + Carousel.prototype.to = function (pos) { + var that = this + var activeIndex = this.getActiveIndex() + + if (pos > (this.$items.length - 1) || pos < 0) return + + if (this.sliding) return this.$element.one('slid', function () { that.to(pos) }) + if (activeIndex == pos) return this.pause().cycle() + + return this.slide(pos > activeIndex ? 'next' : 'prev', $(this.$items[pos])) + } + + Carousel.prototype.pause = function (e) { + e || (this.paused = true) + + if (this.$element.find('.next, .prev').length && $.support.transition.end) { + this.$element.trigger($.support.transition.end) + this.cycle(true) + } + + this.interval = clearInterval(this.interval) + + return this + } + + Carousel.prototype.next = function () { + if (this.sliding) return + return this.slide('next') + } + + Carousel.prototype.prev = function () { + if (this.sliding) return + return this.slide('prev') + } + + Carousel.prototype.slide = function (type, next) { + var $active = this.$element.find('.item.active') + var $next = next || $active[type]() + var isCycling = this.interval + var direction = type == 'next' ? 'left' : 'right' + var fallback = type == 'next' ? 'first' : 'last' + var that = this + + if (!$next.length) { + if (!this.options.wrap) return + $next = this.$element.find('.item')[fallback]() + } + + this.sliding = true + + isCycling && this.pause() + + var e = $.Event('slide.bs.carousel', { relatedTarget: $next[0], direction: direction }) + + if ($next.hasClass('active')) return + + if (this.$indicators.length) { + this.$indicators.find('.active').removeClass('active') + this.$element.one('slid', function () { + var $nextIndicator = $(that.$indicators.children()[that.getActiveIndex()]) + $nextIndicator && $nextIndicator.addClass('active') + }) + } + + if ($.support.transition && this.$element.hasClass('slide')) { + this.$element.trigger(e) + if (e.isDefaultPrevented()) return + $next.addClass(type) + $next[0].offsetWidth // force reflow + $active.addClass(direction) + $next.addClass(direction) + $active + .one($.support.transition.end, function () { + $next.removeClass([type, direction].join(' ')).addClass('active') + $active.removeClass(['active', direction].join(' ')) + that.sliding = false + setTimeout(function () { that.$element.trigger('slid') }, 0) + }) + .emulateTransitionEnd(600) + } else { + this.$element.trigger(e) + if (e.isDefaultPrevented()) return + $active.removeClass('active') + $next.addClass('active') + this.sliding = false + this.$element.trigger('slid') + } + + isCycling && this.cycle() + + return this + } + + + // CAROUSEL PLUGIN DEFINITION + // ========================== + + var old = $.fn.carousel + + $.fn.carousel = function (option) { + return this.each(function () { + var $this = $(this) + var data = $this.data('bs.carousel') + var options = $.extend({}, Carousel.DEFAULTS, $this.data(), typeof option == 'object' && option) + var action = typeof option == 'string' ? option : options.slide + + if (!data) $this.data('bs.carousel', (data = new Carousel(this, options))) + if (typeof option == 'number') data.to(option) + else if (action) data[action]() + else if (options.interval) data.pause().cycle() + }) + } + + $.fn.carousel.Constructor = Carousel + + + // CAROUSEL NO CONFLICT + // ==================== + + $.fn.carousel.noConflict = function () { + $.fn.carousel = old + return this + } + + + // CAROUSEL DATA-API + // ================= + + $(document).on('click.bs.carousel.data-api', '[data-slide], [data-slide-to]', function (e) { + var $this = $(this), href + var $target = $($this.attr('data-target') || (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '')) //strip for ie7 + var options = $.extend({}, $target.data(), $this.data()) + var slideIndex = $this.attr('data-slide-to') + if (slideIndex) options.interval = false + + $target.carousel(options) + + if (slideIndex = $this.attr('data-slide-to')) { + $target.data('bs.carousel').to(slideIndex) + } + + e.preventDefault() + }) + + $(window).on('load', function () { + $('[data-ride="carousel"]').each(function () { + var $carousel = $(this) + $carousel.carousel($carousel.data()) + }) + }) + +}(window.jQuery); + +/* ======================================================================== + * Bootstrap: collapse.js v3.0.0 + * http://twbs.github.com/bootstrap/javascript.html#collapse + * ======================================================================== + * Copyright 2012 Twitter, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ======================================================================== */ + + ++function ($) { "use strict"; + + // COLLAPSE PUBLIC CLASS DEFINITION + // ================================ + + var Collapse = function (element, options) { + this.$element = $(element) + this.options = $.extend({}, Collapse.DEFAULTS, options) + this.transitioning = null + + if (this.options.parent) this.$parent = $(this.options.parent) + if (this.options.toggle) this.toggle() + } + + Collapse.DEFAULTS = { + toggle: true + } + + Collapse.prototype.dimension = function () { + var hasWidth = this.$element.hasClass('width') + return hasWidth ? 'width' : 'height' + } + + Collapse.prototype.show = function () { + if (this.transitioning || this.$element.hasClass('in')) return + + var startEvent = $.Event('show.bs.collapse') + this.$element.trigger(startEvent) + if (startEvent.isDefaultPrevented()) return + + var actives = this.$parent && this.$parent.find('> .panel > .in') + + if (actives && actives.length) { + var hasData = actives.data('bs.collapse') + if (hasData && hasData.transitioning) return + actives.collapse('hide') + hasData || actives.data('bs.collapse', null) + } + + var dimension = this.dimension() + + this.$element + .removeClass('collapse') + .addClass('collapsing') + [dimension](0) + + this.transitioning = 1 + + var complete = function () { + this.$element + .removeClass('collapsing') + .addClass('in') + [dimension]('auto') + this.transitioning = 0 + this.$element.trigger('shown.bs.collapse') + } + + if (!$.support.transition) return complete.call(this) + + var scrollSize = $.camelCase(['scroll', dimension].join('-')) + + this.$element + .one($.support.transition.end, $.proxy(complete, this)) + .emulateTransitionEnd(350) + [dimension](this.$element[0][scrollSize]) + } + + Collapse.prototype.hide = function () { + if (this.transitioning || !this.$element.hasClass('in')) return + + var startEvent = $.Event('hide.bs.collapse') + this.$element.trigger(startEvent) + if (startEvent.isDefaultPrevented()) return + + var dimension = this.dimension() + + this.$element + [dimension](this.$element[dimension]()) + [0].offsetHeight + + this.$element + .addClass('collapsing') + .removeClass('collapse') + .removeClass('in') + + this.transitioning = 1 + + var complete = function () { + this.transitioning = 0 + this.$element + .trigger('hidden.bs.collapse') + .removeClass('collapsing') + .addClass('collapse') + } + + if (!$.support.transition) return complete.call(this) + + this.$element + [dimension](0) + .one($.support.transition.end, $.proxy(complete, this)) + .emulateTransitionEnd(350) + } + + Collapse.prototype.toggle = function () { + this[this.$element.hasClass('in') ? 'hide' : 'show']() + } + + + // COLLAPSE PLUGIN DEFINITION + // ========================== + + var old = $.fn.collapse + + $.fn.collapse = function (option) { + return this.each(function () { + var $this = $(this) + var data = $this.data('bs.collapse') + var options = $.extend({}, Collapse.DEFAULTS, $this.data(), typeof option == 'object' && option) + + if (!data) $this.data('bs.collapse', (data = new Collapse(this, options))) + if (typeof option == 'string') data[option]() + }) + } + + $.fn.collapse.Constructor = Collapse + + + // COLLAPSE NO CONFLICT + // ==================== + + $.fn.collapse.noConflict = function () { + $.fn.collapse = old + return this + } + + + // COLLAPSE DATA-API + // ================= + + $(document).on('click.bs.collapse.data-api', '[data-toggle=collapse]', function (e) { + var $this = $(this), href + var target = $this.attr('data-target') + || e.preventDefault() + || (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '') //strip for ie7 + var $target = $(target) + var data = $target.data('bs.collapse') + var option = data ? 'toggle' : $this.data() + var parent = $this.attr('data-parent') + var $parent = parent && $(parent) + + if (!data || !data.transitioning) { + if ($parent) $parent.find('[data-toggle=collapse][data-parent="' + parent + '"]').not($this).addClass('collapsed') + $this[$target.hasClass('in') ? 'addClass' : 'removeClass']('collapsed') + } + + $target.collapse(option) + }) + +}(window.jQuery); + +/* ======================================================================== + * Bootstrap: dropdown.js v3.0.0 + * http://twbs.github.com/bootstrap/javascript.html#dropdowns + * ======================================================================== + * Copyright 2012 Twitter, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ======================================================================== */ + + ++function ($) { "use strict"; + + // DROPDOWN CLASS DEFINITION + // ========================= + + var backdrop = '.dropdown-backdrop' + var toggle = '[data-toggle=dropdown]' + var Dropdown = function (element) { + var $el = $(element).on('click.bs.dropdown', this.toggle) + } + + Dropdown.prototype.toggle = function (e) { + var $this = $(this) + + if ($this.is('.disabled, :disabled')) return + + var $parent = getParent($this) + var isActive = $parent.hasClass('open') + + clearMenus() + + if (!isActive) { + if ('ontouchstart' in document.documentElement && !$parent.closest('.navbar-nav').length) { + // if mobile we we use a backdrop because click events don't delegate + $('
').insertAfter($(this)).on('click', clearMenus) + } + + $parent.trigger(e = $.Event('show.bs.dropdown')) + + if (e.isDefaultPrevented()) return + + $parent + .toggleClass('open') + .trigger('shown.bs.dropdown') + + $this.focus() + } + + return false + } + + Dropdown.prototype.keydown = function (e) { + if (!/(38|40|27)/.test(e.keyCode)) return + + var $this = $(this) + + e.preventDefault() + e.stopPropagation() + + if ($this.is('.disabled, :disabled')) return + + var $parent = getParent($this) + var isActive = $parent.hasClass('open') + + if (!isActive || (isActive && e.keyCode == 27)) { + if (e.which == 27) $parent.find(toggle).focus() + return $this.click() + } + + var $items = $('[role=menu] li:not(.divider):visible a', $parent) + + if (!$items.length) return + + var index = $items.index($items.filter(':focus')) + + if (e.keyCode == 38 && index > 0) index-- // up + if (e.keyCode == 40 && index < $items.length - 1) index++ // down + if (!~index) index=0 + + $items.eq(index).focus() + } + + function clearMenus() { + $(backdrop).remove() + $(toggle).each(function (e) { + var $parent = getParent($(this)) + if (!$parent.hasClass('open')) return + $parent.trigger(e = $.Event('hide.bs.dropdown')) + if (e.isDefaultPrevented()) return + $parent.removeClass('open').trigger('hidden.bs.dropdown') + }) + } + + function getParent($this) { + var selector = $this.attr('data-target') + + if (!selector) { + selector = $this.attr('href') + selector = selector && /#/.test(selector) && selector.replace(/.*(?=#[^\s]*$)/, '') //strip for ie7 + } + + var $parent = selector && $(selector) + + return $parent && $parent.length ? $parent : $this.parent() + } + + + // DROPDOWN PLUGIN DEFINITION + // ========================== + + var old = $.fn.dropdown + + $.fn.dropdown = function (option) { + return this.each(function () { + var $this = $(this) + var data = $this.data('dropdown') + + if (!data) $this.data('dropdown', (data = new Dropdown(this))) + if (typeof option == 'string') data[option].call($this) + }) + } + + $.fn.dropdown.Constructor = Dropdown + + + // DROPDOWN NO CONFLICT + // ==================== + + $.fn.dropdown.noConflict = function () { + $.fn.dropdown = old + return this + } + + + // APPLY TO STANDARD DROPDOWN ELEMENTS + // =================================== + + $(document) + .on('click.bs.dropdown.data-api', clearMenus) + .on('click.bs.dropdown.data-api', '.dropdown form', function (e) { e.stopPropagation() }) + .on('click.bs.dropdown.data-api' , toggle, Dropdown.prototype.toggle) + .on('keydown.bs.dropdown.data-api', toggle + ', [role=menu]' , Dropdown.prototype.keydown) + +}(window.jQuery); + +/* ======================================================================== + * Bootstrap: modal.js v3.0.0 + * http://twbs.github.com/bootstrap/javascript.html#modals + * ======================================================================== + * Copyright 2012 Twitter, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ======================================================================== */ + + ++function ($) { "use strict"; + + // MODAL CLASS DEFINITION + // ====================== + + var Modal = function (element, options) { + this.options = options + this.$element = $(element) + this.$backdrop = + this.isShown = null + + if (this.options.remote) this.$element.load(this.options.remote) + } + + Modal.DEFAULTS = { + backdrop: true + , keyboard: true + , show: true + } + + Modal.prototype.toggle = function (_relatedTarget) { + return this[!this.isShown ? 'show' : 'hide'](_relatedTarget) + } + + Modal.prototype.show = function (_relatedTarget) { + var that = this + var e = $.Event('show.bs.modal', { relatedTarget: _relatedTarget }) + + this.$element.trigger(e) + + if (this.isShown || e.isDefaultPrevented()) return + + this.isShown = true + + this.escape() + + this.$element.on('click.dismiss.modal', '[data-dismiss="modal"]', $.proxy(this.hide, this)) + + this.backdrop(function () { + var transition = $.support.transition && that.$element.hasClass('fade') + + if (!that.$element.parent().length) { + that.$element.appendTo(document.body) // don't move modals dom position + } + + that.$element.show() + + if (transition) { + that.$element[0].offsetWidth // force reflow + } + + that.$element + .addClass('in') + .attr('aria-hidden', false) + + that.enforceFocus() + + var e = $.Event('shown.bs.modal', { relatedTarget: _relatedTarget }) + + transition ? + that.$element.find('.modal-dialog') // wait for modal to slide in + .one($.support.transition.end, function () { + that.$element.focus().trigger(e) + }) + .emulateTransitionEnd(300) : + that.$element.focus().trigger(e) + }) + } + + Modal.prototype.hide = function (e) { + if (e) e.preventDefault() + + e = $.Event('hide.bs.modal') + + this.$element.trigger(e) + + if (!this.isShown || e.isDefaultPrevented()) return + + this.isShown = false + + this.escape() + + $(document).off('focusin.bs.modal') + + this.$element + .removeClass('in') + .attr('aria-hidden', true) + .off('click.dismiss.modal') + + $.support.transition && this.$element.hasClass('fade') ? + this.$element + .one($.support.transition.end, $.proxy(this.hideModal, this)) + .emulateTransitionEnd(300) : + this.hideModal() + } + + Modal.prototype.enforceFocus = function () { + $(document) + .off('focusin.bs.modal') // guard against infinite focus loop + .on('focusin.bs.modal', $.proxy(function (e) { + if (this.$element[0] !== e.target && !this.$element.has(e.target).length) { + this.$element.focus() + } + }, this)) + } + + Modal.prototype.escape = function () { + if (this.isShown && this.options.keyboard) { + this.$element.on('keyup.dismiss.bs.modal', $.proxy(function (e) { + e.which == 27 && this.hide() + }, this)) + } else if (!this.isShown) { + this.$element.off('keyup.dismiss.bs.modal') + } + } + + Modal.prototype.hideModal = function () { + var that = this + this.$element.hide() + this.backdrop(function () { + that.removeBackdrop() + that.$element.trigger('hidden.bs.modal') + }) + } + + Modal.prototype.removeBackdrop = function () { + this.$backdrop && this.$backdrop.remove() + this.$backdrop = null + } + + Modal.prototype.backdrop = function (callback) { + var that = this + var animate = this.$element.hasClass('fade') ? 'fade' : '' + + if (this.isShown && this.options.backdrop) { + var doAnimate = $.support.transition && animate + + this.$backdrop = $('
') + .appendTo(document.body) + + this.$element.on('click.dismiss.modal', $.proxy(function (e) { + if (e.target !== e.currentTarget) return + this.options.backdrop == 'static' + ? this.$element[0].focus.call(this.$element[0]) + : this.hide.call(this) + }, this)) + + if (doAnimate) this.$backdrop[0].offsetWidth // force reflow + + this.$backdrop.addClass('in') + + if (!callback) return + + doAnimate ? + this.$backdrop + .one($.support.transition.end, callback) + .emulateTransitionEnd(150) : + callback() + + } else if (!this.isShown && this.$backdrop) { + this.$backdrop.removeClass('in') + + $.support.transition && this.$element.hasClass('fade')? + this.$backdrop + .one($.support.transition.end, callback) + .emulateTransitionEnd(150) : + callback() + + } else if (callback) { + callback() + } + } + + + // MODAL PLUGIN DEFINITION + // ======================= + + var old = $.fn.modal + + $.fn.modal = function (option, _relatedTarget) { + return this.each(function () { + var $this = $(this) + var data = $this.data('bs.modal') + var options = $.extend({}, Modal.DEFAULTS, $this.data(), typeof option == 'object' && option) + + if (!data) $this.data('bs.modal', (data = new Modal(this, options))) + if (typeof option == 'string') data[option](_relatedTarget) + else if (options.show) data.show(_relatedTarget) + }) + } + + $.fn.modal.Constructor = Modal + + + // MODAL NO CONFLICT + // ================= + + $.fn.modal.noConflict = function () { + $.fn.modal = old + return this + } + + + // MODAL DATA-API + // ============== + + $(document).on('click.bs.modal.data-api', '[data-toggle="modal"]', function (e) { + var $this = $(this) + var href = $this.attr('href') + var $target = $($this.attr('data-target') || (href && href.replace(/.*(?=#[^\s]+$)/, ''))) //strip for ie7 + var option = $target.data('modal') ? 'toggle' : $.extend({ remote: !/#/.test(href) && href }, $target.data(), $this.data()) + + e.preventDefault() + + $target + .modal(option, this) + .one('hide', function () { + $this.is(':visible') && $this.focus() + }) + }) + + $(document) + .on('show.bs.modal', '.modal', function () { $(document.body).addClass('modal-open') }) + .on('hidden.bs.modal', '.modal', function () { $(document.body).removeClass('modal-open') }) + +}(window.jQuery); + +/* ======================================================================== + * Bootstrap: tooltip.js v3.0.0 + * http://twbs.github.com/bootstrap/javascript.html#tooltip + * Inspired by the original jQuery.tipsy by Jason Frame + * ======================================================================== + * Copyright 2012 Twitter, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ======================================================================== */ + + ++function ($) { "use strict"; + + // TOOLTIP PUBLIC CLASS DEFINITION + // =============================== + + var Tooltip = function (element, options) { + this.type = + this.options = + this.enabled = + this.timeout = + this.hoverState = + this.$element = null + + this.init('tooltip', element, options) + } + + Tooltip.DEFAULTS = { + animation: true + , placement: 'top' + , selector: false + , template: '
' + , trigger: 'hover focus' + , title: '' + , delay: 0 + , html: false + , container: false + } + + Tooltip.prototype.init = function (type, element, options) { + this.enabled = true + this.type = type + this.$element = $(element) + this.options = this.getOptions(options) + + var triggers = this.options.trigger.split(' ') + + for (var i = triggers.length; i--;) { + var trigger = triggers[i] + + if (trigger == 'click') { + this.$element.on('click.' + this.type, this.options.selector, $.proxy(this.toggle, this)) + } else if (trigger != 'manual') { + var eventIn = trigger == 'hover' ? 'mouseenter' : 'focus' + var eventOut = trigger == 'hover' ? 'mouseleave' : 'blur' + + this.$element.on(eventIn + '.' + this.type, this.options.selector, $.proxy(this.enter, this)) + this.$element.on(eventOut + '.' + this.type, this.options.selector, $.proxy(this.leave, this)) + } + } + + this.options.selector ? + (this._options = $.extend({}, this.options, { trigger: 'manual', selector: '' })) : + this.fixTitle() + } + + Tooltip.prototype.getDefaults = function () { + return Tooltip.DEFAULTS + } + + Tooltip.prototype.getOptions = function (options) { + options = $.extend({}, this.getDefaults(), this.$element.data(), options) + + if (options.delay && typeof options.delay == 'number') { + options.delay = { + show: options.delay + , hide: options.delay + } + } + + return options + } + + Tooltip.prototype.getDelegateOptions = function () { + var options = {} + var defaults = this.getDefaults() + + this._options && $.each(this._options, function (key, value) { + if (defaults[key] != value) options[key] = value + }) + + return options + } + + Tooltip.prototype.enter = function (obj) { + var self = obj instanceof this.constructor ? + obj : $(obj.currentTarget)[this.type](this.getDelegateOptions()).data('bs.' + this.type) + + clearTimeout(self.timeout) + + self.hoverState = 'in' + + if (!self.options.delay || !self.options.delay.show) return self.show() + + self.timeout = setTimeout(function () { + if (self.hoverState == 'in') self.show() + }, self.options.delay.show) + } + + Tooltip.prototype.leave = function (obj) { + var self = obj instanceof this.constructor ? + obj : $(obj.currentTarget)[this.type](this.getDelegateOptions()).data('bs.' + this.type) + + clearTimeout(self.timeout) + + self.hoverState = 'out' + + if (!self.options.delay || !self.options.delay.hide) return self.hide() + + self.timeout = setTimeout(function () { + if (self.hoverState == 'out') self.hide() + }, self.options.delay.hide) + } + + Tooltip.prototype.show = function () { + var e = $.Event('show.bs.'+ this.type) + + if (this.hasContent() && this.enabled) { + this.$element.trigger(e) + + if (e.isDefaultPrevented()) return + + var $tip = this.tip() + + this.setContent() + + if (this.options.animation) $tip.addClass('fade') + + var placement = typeof this.options.placement == 'function' ? + this.options.placement.call(this, $tip[0], this.$element[0]) : + this.options.placement + + var autoToken = /\s?auto?\s?/i + var autoPlace = autoToken.test(placement) + if (autoPlace) placement = placement.replace(autoToken, '') || 'top' + + $tip + .detach() + .css({ top: 0, left: 0, display: 'block' }) + .addClass(placement) + + this.options.container ? $tip.appendTo(this.options.container) : $tip.insertAfter(this.$element) + + var pos = this.getPosition() + var actualWidth = $tip[0].offsetWidth + var actualHeight = $tip[0].offsetHeight + + if (autoPlace) { + var $parent = this.$element.parent() + + var orgPlacement = placement + var docScroll = document.documentElement.scrollTop || document.body.scrollTop + var parentWidth = this.options.container == 'body' ? window.innerWidth : $parent.outerWidth() + var parentHeight = this.options.container == 'body' ? window.innerHeight : $parent.outerHeight() + var parentLeft = this.options.container == 'body' ? 0 : $parent.offset().left + + placement = placement == 'bottom' && pos.top + pos.height + actualHeight - docScroll > parentHeight ? 'top' : + placement == 'top' && pos.top - docScroll - actualHeight < 0 ? 'bottom' : + placement == 'right' && pos.right + actualWidth > parentWidth ? 'left' : + placement == 'left' && pos.left - actualWidth < parentLeft ? 'right' : + placement + + $tip + .removeClass(orgPlacement) + .addClass(placement) + } + + var calculatedOffset = this.getCalculatedOffset(placement, pos, actualWidth, actualHeight) + + this.applyPlacement(calculatedOffset, placement) + this.$element.trigger('shown.bs.' + this.type) + } + } + + Tooltip.prototype.applyPlacement = function(offset, placement) { + var replace + var $tip = this.tip() + var width = $tip[0].offsetWidth + var height = $tip[0].offsetHeight + + // manually read margins because getBoundingClientRect includes difference + var marginTop = parseInt($tip.css('margin-top'), 10) + var marginLeft = parseInt($tip.css('margin-left'), 10) + + // we must check for NaN for ie 8/9 + if (isNaN(marginTop)) marginTop = 0 + if (isNaN(marginLeft)) marginLeft = 0 + + offset.top = offset.top + marginTop + offset.left = offset.left + marginLeft + + $tip + .offset(offset) + .addClass('in') + + // check to see if placing tip in new offset caused the tip to resize itself + var actualWidth = $tip[0].offsetWidth + var actualHeight = $tip[0].offsetHeight + + if (placement == 'top' && actualHeight != height) { + replace = true + offset.top = offset.top + height - actualHeight + } + + if (/bottom|top/.test(placement)) { + var delta = 0 + + if (offset.left < 0) { + delta = offset.left * -2 + offset.left = 0 + + $tip.offset(offset) + + actualWidth = $tip[0].offsetWidth + actualHeight = $tip[0].offsetHeight + } + + this.replaceArrow(delta - width + actualWidth, actualWidth, 'left') + } else { + this.replaceArrow(actualHeight - height, actualHeight, 'top') + } + + if (replace) $tip.offset(offset) + } + + Tooltip.prototype.replaceArrow = function(delta, dimension, position) { + this.arrow().css(position, delta ? (50 * (1 - delta / dimension) + "%") : '') + } + + Tooltip.prototype.setContent = function () { + var $tip = this.tip() + var title = this.getTitle() + + $tip.find('.tooltip-inner')[this.options.html ? 'html' : 'text'](title) + $tip.removeClass('fade in top bottom left right') + } + + Tooltip.prototype.hide = function () { + var that = this + var $tip = this.tip() + var e = $.Event('hide.bs.' + this.type) + + function complete() { + if (that.hoverState != 'in') $tip.detach() + } + + this.$element.trigger(e) + + if (e.isDefaultPrevented()) return + + $tip.removeClass('in') + + $.support.transition && this.$tip.hasClass('fade') ? + $tip + .one($.support.transition.end, complete) + .emulateTransitionEnd(150) : + complete() + + this.$element.trigger('hidden.bs.' + this.type) + + return this + } + + Tooltip.prototype.fixTitle = function () { + var $e = this.$element + if ($e.attr('title') || typeof($e.attr('data-original-title')) != 'string') { + $e.attr('data-original-title', $e.attr('title') || '').attr('title', '') + } + } + + Tooltip.prototype.hasContent = function () { + return this.getTitle() + } + + Tooltip.prototype.getPosition = function () { + var el = this.$element[0] + return $.extend({}, (typeof el.getBoundingClientRect == 'function') ? el.getBoundingClientRect() : { + width: el.offsetWidth + , height: el.offsetHeight + }, this.$element.offset()) + } + + Tooltip.prototype.getCalculatedOffset = function (placement, pos, actualWidth, actualHeight) { + return placement == 'bottom' ? { top: pos.top + pos.height, left: pos.left + pos.width / 2 - actualWidth / 2 } : + placement == 'top' ? { top: pos.top - actualHeight, left: pos.left + pos.width / 2 - actualWidth / 2 } : + placement == 'left' ? { top: pos.top + pos.height / 2 - actualHeight / 2, left: pos.left - actualWidth } : + /* placement == 'right' */ { top: pos.top + pos.height / 2 - actualHeight / 2, left: pos.left + pos.width } + } + + Tooltip.prototype.getTitle = function () { + var title + var $e = this.$element + var o = this.options + + title = $e.attr('data-original-title') + || (typeof o.title == 'function' ? o.title.call($e[0]) : o.title) + + return title + } + + Tooltip.prototype.tip = function () { + return this.$tip = this.$tip || $(this.options.template) + } + + Tooltip.prototype.arrow = function () { + return this.$arrow = this.$arrow || this.tip().find('.tooltip-arrow') + } + + Tooltip.prototype.validate = function () { + if (!this.$element[0].parentNode) { + this.hide() + this.$element = null + this.options = null + } + } + + Tooltip.prototype.enable = function () { + this.enabled = true + } + + Tooltip.prototype.disable = function () { + this.enabled = false + } + + Tooltip.prototype.toggleEnabled = function () { + this.enabled = !this.enabled + } + + Tooltip.prototype.toggle = function (e) { + var self = e ? $(e.currentTarget)[this.type](this.getDelegateOptions()).data('bs.' + this.type) : this + self.tip().hasClass('in') ? self.leave(self) : self.enter(self) + } + + Tooltip.prototype.destroy = function () { + this.hide().$element.off('.' + this.type).removeData('bs.' + this.type) + } + + + // TOOLTIP PLUGIN DEFINITION + // ========================= + + var old = $.fn.tooltip + + $.fn.tooltip = function (option) { + return this.each(function () { + var $this = $(this) + var data = $this.data('bs.tooltip') + var options = typeof option == 'object' && option + + if (!data) $this.data('bs.tooltip', (data = new Tooltip(this, options))) + if (typeof option == 'string') data[option]() + }) + } + + $.fn.tooltip.Constructor = Tooltip + + + // TOOLTIP NO CONFLICT + // =================== + + $.fn.tooltip.noConflict = function () { + $.fn.tooltip = old + return this + } + +}(window.jQuery); + +/* ======================================================================== + * Bootstrap: popover.js v3.0.0 + * http://twbs.github.com/bootstrap/javascript.html#popovers + * ======================================================================== + * Copyright 2012 Twitter, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ======================================================================== */ + + ++function ($) { "use strict"; + + // POPOVER PUBLIC CLASS DEFINITION + // =============================== + + var Popover = function (element, options) { + this.init('popover', element, options) + } + + if (!$.fn.tooltip) throw new Error('Popover requires tooltip.js') + + Popover.DEFAULTS = $.extend({} , $.fn.tooltip.Constructor.DEFAULTS, { + placement: 'right' + , trigger: 'click' + , content: '' + , template: '

' + }) + + + // NOTE: POPOVER EXTENDS tooltip.js + // ================================ + + Popover.prototype = $.extend({}, $.fn.tooltip.Constructor.prototype) + + Popover.prototype.constructor = Popover + + Popover.prototype.getDefaults = function () { + return Popover.DEFAULTS + } + + Popover.prototype.setContent = function () { + var $tip = this.tip() + var title = this.getTitle() + var content = this.getContent() + + $tip.find('.popover-title')[this.options.html ? 'html' : 'text'](title) + $tip.find('.popover-content')[this.options.html ? 'html' : 'text'](content) + + $tip.removeClass('fade top bottom left right in') + + // IE8 doesn't accept hiding via the `:empty` pseudo selector, we have to do + // this manually by checking the contents. + if (!$tip.find('.popover-title').html()) $tip.find('.popover-title').hide() + } + + Popover.prototype.hasContent = function () { + return this.getTitle() || this.getContent() + } + + Popover.prototype.getContent = function () { + var $e = this.$element + var o = this.options + + return $e.attr('data-content') + || (typeof o.content == 'function' ? + o.content.call($e[0]) : + o.content) + } + + Popover.prototype.arrow = function () { + return this.$arrow = this.$arrow || this.tip().find('.arrow') + } + + Popover.prototype.tip = function () { + if (!this.$tip) this.$tip = $(this.options.template) + return this.$tip + } + + + // POPOVER PLUGIN DEFINITION + // ========================= + + var old = $.fn.popover + + $.fn.popover = function (option) { + return this.each(function () { + var $this = $(this) + var data = $this.data('bs.popover') + var options = typeof option == 'object' && option + + if (!data) $this.data('bs.popover', (data = new Popover(this, options))) + if (typeof option == 'string') data[option]() + }) + } + + $.fn.popover.Constructor = Popover + + + // POPOVER NO CONFLICT + // =================== + + $.fn.popover.noConflict = function () { + $.fn.popover = old + return this + } + +}(window.jQuery); + +/* ======================================================================== + * Bootstrap: scrollspy.js v3.0.0 + * http://twbs.github.com/bootstrap/javascript.html#scrollspy + * ======================================================================== + * Copyright 2012 Twitter, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ======================================================================== */ + + ++function ($) { "use strict"; + + // SCROLLSPY CLASS DEFINITION + // ========================== + + function ScrollSpy(element, options) { + var href + var process = $.proxy(this.process, this) + + this.$element = $(element).is('body') ? $(window) : $(element) + this.$body = $('body') + this.$scrollElement = this.$element.on('scroll.bs.scroll-spy.data-api', process) + this.options = $.extend({}, ScrollSpy.DEFAULTS, options) + this.selector = (this.options.target + || ((href = $(element).attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '')) //strip for ie7 + || '') + ' .nav li > a' + this.offsets = $([]) + this.targets = $([]) + this.activeTarget = null + + this.refresh() + this.process() + } + + ScrollSpy.DEFAULTS = { + offset: 10 + } + + ScrollSpy.prototype.refresh = function () { + var offsetMethod = this.$element[0] == window ? 'offset' : 'position' + + this.offsets = $([]) + this.targets = $([]) + + var self = this + var $targets = this.$body + .find(this.selector) + .map(function () { + var $el = $(this) + var href = $el.data('target') || $el.attr('href') + var $href = /^#\w/.test(href) && $(href) + + return ($href + && $href.length + && [[ $href[offsetMethod]().top + (!$.isWindow(self.$scrollElement.get(0)) && self.$scrollElement.scrollTop()), href ]]) || null + }) + .sort(function (a, b) { return a[0] - b[0] }) + .each(function () { + self.offsets.push(this[0]) + self.targets.push(this[1]) + }) + } + + ScrollSpy.prototype.process = function () { + var scrollTop = this.$scrollElement.scrollTop() + this.options.offset + var scrollHeight = this.$scrollElement[0].scrollHeight || this.$body[0].scrollHeight + var maxScroll = scrollHeight - this.$scrollElement.height() + var offsets = this.offsets + var targets = this.targets + var activeTarget = this.activeTarget + var i + + if (scrollTop >= maxScroll) { + return activeTarget != (i = targets.last()[0]) && this.activate(i) + } + + for (i = offsets.length; i--;) { + activeTarget != targets[i] + && scrollTop >= offsets[i] + && (!offsets[i + 1] || scrollTop <= offsets[i + 1]) + && this.activate( targets[i] ) + } + } + + ScrollSpy.prototype.activate = function (target) { + this.activeTarget = target + + $(this.selector) + .parents('.active') + .removeClass('active') + + var selector = this.selector + + '[data-target="' + target + '"],' + + this.selector + '[href="' + target + '"]' + + var active = $(selector) + .parents('li') + .addClass('active') + + if (active.parent('.dropdown-menu').length) { + active = active + .closest('li.dropdown') + .addClass('active') + } + + active.trigger('activate') + } + + + // SCROLLSPY PLUGIN DEFINITION + // =========================== + + var old = $.fn.scrollspy + + $.fn.scrollspy = function (option) { + return this.each(function () { + var $this = $(this) + var data = $this.data('bs.scrollspy') + var options = typeof option == 'object' && option + + if (!data) $this.data('bs.scrollspy', (data = new ScrollSpy(this, options))) + if (typeof option == 'string') data[option]() + }) + } + + $.fn.scrollspy.Constructor = ScrollSpy + + + // SCROLLSPY NO CONFLICT + // ===================== + + $.fn.scrollspy.noConflict = function () { + $.fn.scrollspy = old + return this + } + + + // SCROLLSPY DATA-API + // ================== + + $(window).on('load', function () { + $('[data-spy="scroll"]').each(function () { + var $spy = $(this) + $spy.scrollspy($spy.data()) + }) + }) + +}(window.jQuery); + +/* ======================================================================== + * Bootstrap: tab.js v3.0.0 + * http://twbs.github.com/bootstrap/javascript.html#tabs + * ======================================================================== + * Copyright 2012 Twitter, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ======================================================================== */ + + ++function ($) { "use strict"; + + // TAB CLASS DEFINITION + // ==================== + + var Tab = function (element) { + this.element = $(element) + } + + Tab.prototype.show = function () { + var $this = this.element + var $ul = $this.closest('ul:not(.dropdown-menu)') + var selector = $this.attr('data-target') + + if (!selector) { + selector = $this.attr('href') + selector = selector && selector.replace(/.*(?=#[^\s]*$)/, '') //strip for ie7 + } + + if ($this.parent('li').hasClass('active')) return + + var previous = $ul.find('.active:last a')[0] + var e = $.Event('show.bs.tab', { + relatedTarget: previous + }) + + $this.trigger(e) + + if (e.isDefaultPrevented()) return + + var $target = $(selector) + + this.activate($this.parent('li'), $ul) + this.activate($target, $target.parent(), function () { + $this.trigger({ + type: 'shown.bs.tab' + , relatedTarget: previous + }) + }) + } + + Tab.prototype.activate = function (element, container, callback) { + var $active = container.find('> .active') + var transition = callback + && $.support.transition + && $active.hasClass('fade') + + function next() { + $active + .removeClass('active') + .find('> .dropdown-menu > .active') + .removeClass('active') + + element.addClass('active') + + if (transition) { + element[0].offsetWidth // reflow for transition + element.addClass('in') + } else { + element.removeClass('fade') + } + + if (element.parent('.dropdown-menu')) { + element.closest('li.dropdown').addClass('active') + } + + callback && callback() + } + + transition ? + $active + .one($.support.transition.end, next) + .emulateTransitionEnd(150) : + next() + + $active.removeClass('in') + } + + + // TAB PLUGIN DEFINITION + // ===================== + + var old = $.fn.tab + + $.fn.tab = function ( option ) { + return this.each(function () { + var $this = $(this) + var data = $this.data('bs.tab') + + if (!data) $this.data('bs.tab', (data = new Tab(this))) + if (typeof option == 'string') data[option]() + }) + } + + $.fn.tab.Constructor = Tab + + + // TAB NO CONFLICT + // =============== + + $.fn.tab.noConflict = function () { + $.fn.tab = old + return this + } + + + // TAB DATA-API + // ============ + + $(document).on('click.bs.tab.data-api', '[data-toggle="tab"], [data-toggle="pill"]', function (e) { + e.preventDefault() + $(this).tab('show') + }) + +}(window.jQuery); + +/* ======================================================================== + * Bootstrap: affix.js v3.0.0 + * http://twbs.github.com/bootstrap/javascript.html#affix + * ======================================================================== + * Copyright 2012 Twitter, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ======================================================================== */ + + ++function ($) { "use strict"; + + // AFFIX CLASS DEFINITION + // ====================== + + var Affix = function (element, options) { + this.options = $.extend({}, Affix.DEFAULTS, options) + this.$window = $(window) + .on('scroll.bs.affix.data-api', $.proxy(this.checkPosition, this)) + .on('click.bs.affix.data-api', $.proxy(this.checkPositionWithEventLoop, this)) + + this.$element = $(element) + this.affixed = + this.unpin = null + + this.checkPosition() + } + + Affix.RESET = 'affix affix-top affix-bottom' + + Affix.DEFAULTS = { + offset: 0 + } + + Affix.prototype.checkPositionWithEventLoop = function () { + setTimeout($.proxy(this.checkPosition, this), 1) + } + + Affix.prototype.checkPosition = function () { + if (!this.$element.is(':visible')) return + + var scrollHeight = $(document).height() + var scrollTop = this.$window.scrollTop() + var position = this.$element.offset() + var offset = this.options.offset + var offsetTop = offset.top + var offsetBottom = offset.bottom + + if (typeof offset != 'object') offsetBottom = offsetTop = offset + if (typeof offsetTop == 'function') offsetTop = offset.top() + if (typeof offsetBottom == 'function') offsetBottom = offset.bottom() + + var affix = this.unpin != null && (scrollTop + this.unpin <= position.top) ? false : + offsetBottom != null && (position.top + this.$element.height() >= scrollHeight - offsetBottom) ? 'bottom' : + offsetTop != null && (scrollTop <= offsetTop) ? 'top' : false + + if (this.affixed === affix) return + if (this.unpin) this.$element.css('top', '') + + this.affixed = affix + this.unpin = affix == 'bottom' ? position.top - scrollTop : null + + this.$element.removeClass(Affix.RESET).addClass('affix' + (affix ? '-' + affix : '')) + + if (affix == 'bottom') { + this.$element.offset({ top: document.body.offsetHeight - offsetBottom - this.$element.height() }) + } + } + + + // AFFIX PLUGIN DEFINITION + // ======================= + + var old = $.fn.affix + + $.fn.affix = function (option) { + return this.each(function () { + var $this = $(this) + var data = $this.data('bs.affix') + var options = typeof option == 'object' && option + + if (!data) $this.data('bs.affix', (data = new Affix(this, options))) + if (typeof option == 'string') data[option]() + }) + } + + $.fn.affix.Constructor = Affix + + + // AFFIX NO CONFLICT + // ================= + + $.fn.affix.noConflict = function () { + $.fn.affix = old + return this + } + + + // AFFIX DATA-API + // ============== + + $(window).on('load', function () { + $('[data-spy="affix"]').each(function () { + var $spy = $(this) + var data = $spy.data() + + data.offset = data.offset || {} + + if (data.offsetBottom) data.offset.bottom = data.offsetBottom + if (data.offsetTop) data.offset.top = data.offsetTop + + $spy.affix(data) + }) + }) + +}(window.jQuery); diff --git a/web/install/styles.css b/web/install/styles.css new file mode 100644 index 000000000..98454c60e --- /dev/null +++ b/web/install/styles.css @@ -0,0 +1,7534 @@ +article, +aside, +details, +figcaption, +figure, +footer, +header, +hgroup, +main, +nav, +section, +summary { + display: block; +} +audio, +canvas, +video { + display: inline-block; +} +audio:not([controls]) { + display: none; + height: 0; +} +[hidden] { + display: none; +} +html { + font-family: sans-serif; + -webkit-text-size-adjust: 100%; + -ms-text-size-adjust: 100%; +} +body { + margin: 0; +} +a:focus { + outline: thin dotted; +} +a:active, +a:hover { + outline: 0; +} +h1 { + font-size: 2em; + margin: 0.67em 0; +} +abbr[title] { + border-bottom: 1px dotted; +} +b, +strong { + font-weight: bold; +} +dfn { + font-style: italic; +} +hr { + -moz-box-sizing: content-box; + box-sizing: content-box; + height: 0; +} +mark { + background: #ff0; + color: #000; +} +code, +kbd, +pre, +samp { + font-family: monospace, serif; + font-size: 1em; +} +pre { + white-space: pre-wrap; +} +q { + quotes: "\201C" "\201D" "\2018" "\2019"; +} +small { + font-size: 80%; +} +sub, +sup { + font-size: 75%; + line-height: 0; + position: relative; + vertical-align: baseline; +} +sup { + top: -0.5em; +} +sub { + bottom: -0.25em; +} +img { + border: 0; +} +svg:not(:root) { + overflow: hidden; +} +figure { + margin: 0; +} +fieldset { + border: 1px solid #c0c0c0; + margin: 0 2px; + padding: 0.35em 0.625em 0.75em; +} +legend { + border: 0; + padding: 0; +} +button, +input, +select, +textarea { + font-family: inherit; + font-size: 100%; + margin: 0; +} +button, +input { + line-height: normal; +} +button, +select { + text-transform: none; +} +button, +html input[type="button"], +input[type="reset"], +input[type="submit"] { + -webkit-appearance: button; + cursor: pointer; +} +button[disabled], +html input[disabled] { + cursor: default; +} +input[type="checkbox"], +input[type="radio"] { + box-sizing: border-box; + padding: 0; +} +input[type="search"] { + -webkit-appearance: textfield; + -moz-box-sizing: content-box; + -webkit-box-sizing: content-box; + box-sizing: content-box; +} +input[type="search"]::-webkit-search-cancel-button, +input[type="search"]::-webkit-search-decoration { + -webkit-appearance: none; +} +button::-moz-focus-inner, +input::-moz-focus-inner { + border: 0; + padding: 0; +} +textarea { + overflow: auto; + vertical-align: top; +} +table { + border-collapse: collapse; + border-spacing: 0; +} +@media print { + * { + text-shadow: none !important; + color: #000 !important; + background: transparent !important; + box-shadow: none !important; + } + a, + a:visited { + text-decoration: underline; + } + a[href]:after { + content: " (" attr(href) ")"; + } + abbr[title]:after { + content: " (" attr(title) ")"; + } + .ir a:after, + a[href^="javascript:"]:after, + a[href^="#"]:after { + content: ""; + } + pre, + blockquote { + border: 1px solid #999; + page-break-inside: avoid; + } + thead { + display: table-header-group; + } + tr, + img { + page-break-inside: avoid; + } + img { + max-width: 100% !important; + } + @page { + margin: 2cm .5cm; + } + p, + h2, + h3 { + orphans: 3; + widows: 3; + } + h2, + h3 { + page-break-after: avoid; + } + .navbar { + display: none; + } + .table td, + .table th { + background-color: #fff !important; + } + .btn > .caret, + .dropup > .btn > .caret { + border-top-color: #000 !important; + } + .label { + border: 1px solid #000; + } + .table { + border-collapse: collapse !important; + } + .table-bordered th, + .table-bordered td { + border: 1px solid #ddd !important; + } +} +*, +*:before, +*:after { + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box; +} +html { + font-size: 62.5%; + -webkit-tap-highlight-color: rgba(0,0,0,0); +} +body { + font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; + font-size: 13px; + line-height: 1.428571429; + color: #333333; + background-color: #fff; +} +input, +button, +select, +textarea { + font-family: inherit; + font-size: inherit; + line-height: inherit; +} +button, +input, +select[multiple], +textarea { + background-image: none; +} +a { + color: #e9720f; + text-decoration: none; +} +a:hover, +a:focus { + color: #a14f0a; + text-decoration: underline; +} +a:focus { + outline: thin dotted #333; + outline: 5px auto -webkit-focus-ring-color; + outline-offset: -2px; +} +img { + vertical-align: middle; +} +.img-responsive { + display: block; + max-width: 100%; + height: auto; +} +.img-rounded { + border-radius: 6px; +} +.img-thumbnail { + padding: 4px; + line-height: 1.428571429; + background-color: #fff; + border: 1px solid #ddd; + border-radius: 4px; + -webkit-transition: all .2s ease-in-out; + transition: all .2s ease-in-out; + display: inline-block; + max-width: 100%; + height: auto; +} +.img-circle { + border-radius: 50%; +} +hr { + margin-top: 18px; + margin-bottom: 18px; + border: 0; + border-top: 1px solid #eeeeee; +} +.sr-only { + position: absolute; + width: 1px; + height: 1px; + margin: -1px; + padding: 0; + overflow: hidden; + clip: rect(0 0 0 0); + border: 0; +} +p { + margin: 0 0 9px; +} +.lead { + margin-bottom: 18px; + font-size: 14.95px; + font-weight: 200; + line-height: 1.4; +} +@media (min-width: 768px) { + .lead { + font-size: 19.5px; + } +} +small { + font-size: 85%; +} +cite { + font-style: normal; +} +.text-muted { + color: #999999; +} +.text-primary { + color: #f39922; +} +.text-warning { + color: #c09853; +} +.text-danger { + color: #b94a48; +} +.text-success { + color: #468847; +} +.text-info { + color: #3a87ad; +} +.text-left { + text-align: left; +} +.text-right { + text-align: right; +} +.text-center { + text-align: center; +} +h1, +h2, +h3, +h4, +h5, +h6, +.h1, +.h2, +.h3, +.h4, +.h5, +.h6 { + font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; + font-weight: 500; + line-height: 1.1; +} +h1 small, +h2 small, +h3 small, +h4 small, +h5 small, +h6 small, +.h1 small, +.h2 small, +.h3 small, +.h4 small, +.h5 small, +.h6 small { + font-weight: normal; + line-height: 1; + color: #999999; +} +h1, +h2, +h3 { + margin-top: 18px; + margin-bottom: 9px; +} +h4, +h5, +h6 { + margin-top: 9px; + margin-bottom: 9px; +} +h1, +.h1 { + font-size: 33px; +} +h2, +.h2 { + font-size: 27px; +} +h3, +.h3 { + font-size: 23px; +} +h4, +.h4 { + font-size: 17px; +} +h5, +.h5 { + font-size: 13px; +} +h6, +.h6 { + font-size: 12px; +} +h1 small, +.h1 small { + font-size: 23px; +} +h2 small, +.h2 small { + font-size: 17px; +} +h3 small, +.h3 small, +h4 small, +.h4 small { + font-size: 13px; +} +.page-header { + padding-bottom: 8px; + margin: 36px 0 18px; + border-bottom: 1px solid #eeeeee; +} +ul, +ol { + margin-top: 0; + margin-bottom: 9px; +} +ul ul, +ul ol, +ol ul, +ol ol { + margin-bottom: 0; +} +.list-unstyled { + padding-left: 0; + list-style: none; +} +.list-inline { + padding-left: 0; + list-style: none; +} +.list-inline > li { + display: inline-block; + padding-left: 5px; + padding-right: 5px; +} +dl { + margin-bottom: 18px; +} +dt, +dd { + line-height: 1.428571429; +} +dt { + font-weight: bold; +} +dd { + margin-left: 0; +} +@media (min-width: 768px) { + .dl-horizontal dt { + float: left; + width: 160px; + clear: left; + text-align: right; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + } + .dl-horizontal dd { + margin-left: 180px; + } + .dl-horizontal dd:before, + .dl-horizontal dd:after { + content: " "; + display: table; + } + .dl-horizontal dd:after { + clear: both; + } + .dl-horizontal dd:before, + .dl-horizontal dd:after { + content: " "; + display: table; + } + .dl-horizontal dd:after { + clear: both; + } +} +abbr[title], +abbr[data-original-title] { + cursor: help; + border-bottom: 1px dotted #999999; +} +abbr.initialism { + font-size: 90%; + text-transform: uppercase; +} +blockquote { + padding: 9px 18px; + margin: 0 0 18px; + border-left: 5px solid #eeeeee; +} +blockquote p { + font-size: 16.25px; + font-weight: 300; + line-height: 1.25; +} +blockquote p:last-child { + margin-bottom: 0; +} +blockquote small { + display: block; + line-height: 1.428571429; + color: #999999; +} +blockquote small:before { + content: '\2014 \00A0'; +} +blockquote.pull-right { + padding-right: 15px; + padding-left: 0; + border-right: 5px solid #eeeeee; + border-left: 0; +} +blockquote.pull-right p, +blockquote.pull-right small { + text-align: right; +} +blockquote.pull-right small:before { + content: ''; +} +blockquote.pull-right small:after { + content: '\00A0 \2014'; +} +q:before, +q:after, +blockquote:before, +blockquote:after { + content: ""; +} +address { + display: block; + margin-bottom: 18px; + font-style: normal; + line-height: 1.428571429; +} +code, +pre { + font-family: Monaco, Menlo, Consolas, "Courier New", monospace; +} +code { + padding: 2px 4px; + font-size: 90%; + color: #c7254e; + background-color: #f9f2f4; + white-space: nowrap; + border-radius: 4px; +} +pre { + display: block; + padding: 8.5px; + margin: 0 0 9px; + font-size: 12px; + line-height: 1.428571429; + word-break: break-all; + word-wrap: break-word; + color: #333333; + background-color: #f5f5f5; + border: 1px solid #ccc; + border-radius: 4px; +} +pre.prettyprint { + margin-bottom: 18px; +} +pre code { + padding: 0; + font-size: inherit; + color: inherit; + white-space: pre-wrap; + background-color: transparent; + border: 0; +} +.pre-scrollable { + max-height: 340px; + overflow-y: scroll; +} +.container { + margin-right: auto; + margin-left: auto; + padding-left: 15px; + padding-right: 15px; +} +.container:before, +.container:after { + content: " "; + display: table; +} +.container:after { + clear: both; +} +.container:before, +.container:after { + content: " "; + display: table; +} +.container:after { + clear: both; +} +.row { + margin-left: -15px; + margin-right: -15px; +} +.row:before, +.row:after { + content: " "; + display: table; +} +.row:after { + clear: both; +} +.row:before, +.row:after { + content: " "; + display: table; +} +.row:after { + clear: both; +} +.col-xs-1, +.col-xs-2, +.col-xs-3, +.col-xs-4, +.col-xs-5, +.col-xs-6, +.col-xs-7, +.col-xs-8, +.col-xs-9, +.col-xs-10, +.col-xs-11, +.col-xs-12, +.col-sm-1, +.col-sm-2, +.col-sm-3, +.col-sm-4, +.col-sm-5, +.col-sm-6, +.col-sm-7, +.col-sm-8, +.col-sm-9, +.col-sm-10, +.col-sm-11, +.col-sm-12, +.col-md-1, +.col-md-2, +.col-md-3, +.col-md-4, +.col-md-5, +.col-md-6, +.col-md-7, +.col-md-8, +.col-md-9, +.col-md-10, +.col-md-11, +.col-md-12, +.col-lg-1, +.col-lg-2, +.col-lg-3, +.col-lg-4, +.col-lg-5, +.col-lg-6, +.col-lg-7, +.col-lg-8, +.col-lg-9, +.col-lg-10, +.col-lg-11, +.col-lg-12 { + position: relative; + min-height: 1px; + padding-left: 15px; + padding-right: 15px; +} +.col-xs-1, +.col-xs-2, +.col-xs-3, +.col-xs-4, +.col-xs-5, +.col-xs-6, +.col-xs-7, +.col-xs-8, +.col-xs-9, +.col-xs-10, +.col-xs-11 { + float: left; +} +.col-xs-1 { + width: 8.3333333333333%; +} +.col-xs-2 { + width: 16.666666666667%; +} +.col-xs-3 { + width: 25%; +} +.col-xs-4 { + width: 33.333333333333%; +} +.col-xs-5 { + width: 41.666666666667%; +} +.col-xs-6 { + width: 50%; +} +.col-xs-7 { + width: 58.333333333333%; +} +.col-xs-8 { + width: 66.666666666667%; +} +.col-xs-9 { + width: 75%; +} +.col-xs-10 { + width: 83.333333333333%; +} +.col-xs-11 { + width: 91.666666666667%; +} +.col-xs-12 { + width: 100%; +} +@media (min-width: 768px) { + .container { + max-width: 750px; + } + .col-sm-1, + .col-sm-2, + .col-sm-3, + .col-sm-4, + .col-sm-5, + .col-sm-6, + .col-sm-7, + .col-sm-8, + .col-sm-9, + .col-sm-10, + .col-sm-11 { + float: left; + } + .col-sm-1 { + width: 8.3333333333333%; + } + .col-sm-2 { + width: 16.666666666667%; + } + .col-sm-3 { + width: 25%; + } + .col-sm-4 { + width: 33.333333333333%; + } + .col-sm-5 { + width: 41.666666666667%; + } + .col-sm-6 { + width: 50%; + } + .col-sm-7 { + width: 58.333333333333%; + } + .col-sm-8 { + width: 66.666666666667%; + } + .col-sm-9 { + width: 75%; + } + .col-sm-10 { + width: 83.333333333333%; + } + .col-sm-11 { + width: 91.666666666667%; + } + .col-sm-12 { + width: 100%; + } + .col-sm-push-1 { + left: 8.3333333333333%; + } + .col-sm-push-2 { + left: 16.666666666667%; + } + .col-sm-push-3 { + left: 25%; + } + .col-sm-push-4 { + left: 33.333333333333%; + } + .col-sm-push-5 { + left: 41.666666666667%; + } + .col-sm-push-6 { + left: 50%; + } + .col-sm-push-7 { + left: 58.333333333333%; + } + .col-sm-push-8 { + left: 66.666666666667%; + } + .col-sm-push-9 { + left: 75%; + } + .col-sm-push-10 { + left: 83.333333333333%; + } + .col-sm-push-11 { + left: 91.666666666667%; + } + .col-sm-pull-1 { + right: 8.3333333333333%; + } + .col-sm-pull-2 { + right: 16.666666666667%; + } + .col-sm-pull-3 { + right: 25%; + } + .col-sm-pull-4 { + right: 33.333333333333%; + } + .col-sm-pull-5 { + right: 41.666666666667%; + } + .col-sm-pull-6 { + right: 50%; + } + .col-sm-pull-7 { + right: 58.333333333333%; + } + .col-sm-pull-8 { + right: 66.666666666667%; + } + .col-sm-pull-9 { + right: 75%; + } + .col-sm-pull-10 { + right: 83.333333333333%; + } + .col-sm-pull-11 { + right: 91.666666666667%; + } + .col-sm-offset-1 { + margin-left: 8.3333333333333%; + } + .col-sm-offset-2 { + margin-left: 16.666666666667%; + } + .col-sm-offset-3 { + margin-left: 25%; + } + .col-sm-offset-4 { + margin-left: 33.333333333333%; + } + .col-sm-offset-5 { + margin-left: 41.666666666667%; + } + .col-sm-offset-6 { + margin-left: 50%; + } + .col-sm-offset-7 { + margin-left: 58.333333333333%; + } + .col-sm-offset-8 { + margin-left: 66.666666666667%; + } + .col-sm-offset-9 { + margin-left: 75%; + } + .col-sm-offset-10 { + margin-left: 83.333333333333%; + } + .col-sm-offset-11 { + margin-left: 91.666666666667%; + } +} +@media (min-width: 992px) { + .container { + max-width: 970px; + } + .col-md-1, + .col-md-2, + .col-md-3, + .col-md-4, + .col-md-5, + .col-md-6, + .col-md-7, + .col-md-8, + .col-md-9, + .col-md-10, + .col-md-11 { + float: left; + } + .col-md-1 { + width: 8.3333333333333%; + } + .col-md-2 { + width: 16.666666666667%; + } + .col-md-3 { + width: 25%; + } + .col-md-4 { + width: 33.333333333333%; + } + .col-md-5 { + width: 41.666666666667%; + } + .col-md-6 { + width: 50%; + } + .col-md-7 { + width: 58.333333333333%; + } + .col-md-8 { + width: 66.666666666667%; + } + .col-md-9 { + width: 75%; + } + .col-md-10 { + width: 83.333333333333%; + } + .col-md-11 { + width: 91.666666666667%; + } + .col-md-12 { + width: 100%; + } + .col-md-push-0 { + left: auto; + } + .col-md-push-1 { + left: 8.3333333333333%; + } + .col-md-push-2 { + left: 16.666666666667%; + } + .col-md-push-3 { + left: 25%; + } + .col-md-push-4 { + left: 33.333333333333%; + } + .col-md-push-5 { + left: 41.666666666667%; + } + .col-md-push-6 { + left: 50%; + } + .col-md-push-7 { + left: 58.333333333333%; + } + .col-md-push-8 { + left: 66.666666666667%; + } + .col-md-push-9 { + left: 75%; + } + .col-md-push-10 { + left: 83.333333333333%; + } + .col-md-push-11 { + left: 91.666666666667%; + } + .col-md-pull-0 { + right: auto; + } + .col-md-pull-1 { + right: 8.3333333333333%; + } + .col-md-pull-2 { + right: 16.666666666667%; + } + .col-md-pull-3 { + right: 25%; + } + .col-md-pull-4 { + right: 33.333333333333%; + } + .col-md-pull-5 { + right: 41.666666666667%; + } + .col-md-pull-6 { + right: 50%; + } + .col-md-pull-7 { + right: 58.333333333333%; + } + .col-md-pull-8 { + right: 66.666666666667%; + } + .col-md-pull-9 { + right: 75%; + } + .col-md-pull-10 { + right: 83.333333333333%; + } + .col-md-pull-11 { + right: 91.666666666667%; + } + .col-md-offset-0 { + margin-left: 0; + } + .col-md-offset-1 { + margin-left: 8.3333333333333%; + } + .col-md-offset-2 { + margin-left: 16.666666666667%; + } + .col-md-offset-3 { + margin-left: 25%; + } + .col-md-offset-4 { + margin-left: 33.333333333333%; + } + .col-md-offset-5 { + margin-left: 41.666666666667%; + } + .col-md-offset-6 { + margin-left: 50%; + } + .col-md-offset-7 { + margin-left: 58.333333333333%; + } + .col-md-offset-8 { + margin-left: 66.666666666667%; + } + .col-md-offset-9 { + margin-left: 75%; + } + .col-md-offset-10 { + margin-left: 83.333333333333%; + } + .col-md-offset-11 { + margin-left: 91.666666666667%; + } +} +@media (min-width: 1200px) { + .container { + max-width: 1170px; + } + .col-lg-1, + .col-lg-2, + .col-lg-3, + .col-lg-4, + .col-lg-5, + .col-lg-6, + .col-lg-7, + .col-lg-8, + .col-lg-9, + .col-lg-10, + .col-lg-11 { + float: left; + } + .col-lg-1 { + width: 8.3333333333333%; + } + .col-lg-2 { + width: 16.666666666667%; + } + .col-lg-3 { + width: 25%; + } + .col-lg-4 { + width: 33.333333333333%; + } + .col-lg-5 { + width: 41.666666666667%; + } + .col-lg-6 { + width: 50%; + } + .col-lg-7 { + width: 58.333333333333%; + } + .col-lg-8 { + width: 66.666666666667%; + } + .col-lg-9 { + width: 75%; + } + .col-lg-10 { + width: 83.333333333333%; + } + .col-lg-11 { + width: 91.666666666667%; + } + .col-lg-12 { + width: 100%; + } + .col-lg-push-0 { + left: auto; + } + .col-lg-push-1 { + left: 8.3333333333333%; + } + .col-lg-push-2 { + left: 16.666666666667%; + } + .col-lg-push-3 { + left: 25%; + } + .col-lg-push-4 { + left: 33.333333333333%; + } + .col-lg-push-5 { + left: 41.666666666667%; + } + .col-lg-push-6 { + left: 50%; + } + .col-lg-push-7 { + left: 58.333333333333%; + } + .col-lg-push-8 { + left: 66.666666666667%; + } + .col-lg-push-9 { + left: 75%; + } + .col-lg-push-10 { + left: 83.333333333333%; + } + .col-lg-push-11 { + left: 91.666666666667%; + } + .col-lg-pull-0 { + right: auto; + } + .col-lg-pull-1 { + right: 8.3333333333333%; + } + .col-lg-pull-2 { + right: 16.666666666667%; + } + .col-lg-pull-3 { + right: 25%; + } + .col-lg-pull-4 { + right: 33.333333333333%; + } + .col-lg-pull-5 { + right: 41.666666666667%; + } + .col-lg-pull-6 { + right: 50%; + } + .col-lg-pull-7 { + right: 58.333333333333%; + } + .col-lg-pull-8 { + right: 66.666666666667%; + } + .col-lg-pull-9 { + right: 75%; + } + .col-lg-pull-10 { + right: 83.333333333333%; + } + .col-lg-pull-11 { + right: 91.666666666667%; + } + .col-lg-offset-0 { + margin-left: 0; + } + .col-lg-offset-1 { + margin-left: 8.3333333333333%; + } + .col-lg-offset-2 { + margin-left: 16.666666666667%; + } + .col-lg-offset-3 { + margin-left: 25%; + } + .col-lg-offset-4 { + margin-left: 33.333333333333%; + } + .col-lg-offset-5 { + margin-left: 41.666666666667%; + } + .col-lg-offset-6 { + margin-left: 50%; + } + .col-lg-offset-7 { + margin-left: 58.333333333333%; + } + .col-lg-offset-8 { + margin-left: 66.666666666667%; + } + .col-lg-offset-9 { + margin-left: 75%; + } + .col-lg-offset-10 { + margin-left: 83.333333333333%; + } + .col-lg-offset-11 { + margin-left: 91.666666666667%; + } +} +table { + max-width: 100%; + background-color: transparent; +} +th { + text-align: left; +} +.table { + width: 100%; + margin-bottom: 18px; +} +.table thead > tr > th, +.table thead > tr > td, +.table tbody > tr > th, +.table tbody > tr > td, +.table tfoot > tr > th, +.table tfoot > tr > td { + padding: 8px; + line-height: 1.428571429; + vertical-align: top; + border-top: 1px solid #ddd; +} +.table thead > tr > th { + vertical-align: bottom; + border-bottom: 2px solid #ddd; +} +.table caption + thead tr:first-child th, +.table caption + thead tr:first-child td, +.table colgroup + thead tr:first-child th, +.table colgroup + thead tr:first-child td, +.table thead:first-child tr:first-child th, +.table thead:first-child tr:first-child td { + border-top: 0; +} +.table tbody + tbody { + border-top: 2px solid #ddd; +} +.table .table { + background-color: #fff; +} +.table-condensed thead > tr > th, +.table-condensed thead > tr > td, +.table-condensed tbody > tr > th, +.table-condensed tbody > tr > td, +.table-condensed tfoot > tr > th, +.table-condensed tfoot > tr > td { + padding: 5px; +} +.table-bordered { + border: 1px solid #ddd; +} +.table-bordered > thead > tr > th, +.table-bordered > thead > tr > td, +.table-bordered > tbody > tr > th, +.table-bordered > tbody > tr > td, +.table-bordered > tfoot > tr > th, +.table-bordered > tfoot > tr > td { + border: 1px solid #ddd; +} +.table-bordered > thead > tr > th, +.table-bordered > thead > tr > td { + border-bottom-width: 2px; +} +.table-striped > tbody > tr:nth-child(odd) > td, +.table-striped > tbody > tr:nth-child(odd) > th { + background-color: #f9f9f9; +} +.table-hover > tbody > tr:hover > td, +.table-hover > tbody > tr:hover > th { + background-color: #f5f5f5; +} +table col[class*="col-"] { + float: none; + display: table-column; +} +table td[class*="col-"], +table th[class*="col-"] { + float: none; + display: table-cell; +} +.table > thead > tr > td.active, +.table > thead > tr > th.active, +.table > thead > tr.active > td, +.table > thead > tr.active > th, +.table > tbody > tr > td.active, +.table > tbody > tr > th.active, +.table > tbody > tr.active > td, +.table > tbody > tr.active > th, +.table > tfoot > tr > td.active, +.table > tfoot > tr > th.active, +.table > tfoot > tr.active > td, +.table > tfoot > tr.active > th { + background-color: #f5f5f5; +} +.table > thead > tr > td.success, +.table > thead > tr > th.success, +.table > thead > tr.success > td, +.table > thead > tr.success > th, +.table > tbody > tr > td.success, +.table > tbody > tr > th.success, +.table > tbody > tr.success > td, +.table > tbody > tr.success > th, +.table > tfoot > tr > td.success, +.table > tfoot > tr > th.success, +.table > tfoot > tr.success > td, +.table > tfoot > tr.success > th { + background-color: #dff0d8; + border-color: #d6e9c6; +} +.table-hover > tbody > tr > td.success:hover, +.table-hover > tbody > tr > th.success:hover, +.table-hover > tbody > tr.success:hover > td { + background-color: #d0e9c6; + border-color: #c9e2b3; +} +.table > thead > tr > td.danger, +.table > thead > tr > th.danger, +.table > thead > tr.danger > td, +.table > thead > tr.danger > th, +.table > tbody > tr > td.danger, +.table > tbody > tr > th.danger, +.table > tbody > tr.danger > td, +.table > tbody > tr.danger > th, +.table > tfoot > tr > td.danger, +.table > tfoot > tr > th.danger, +.table > tfoot > tr.danger > td, +.table > tfoot > tr.danger > th { + background-color: #f2dede; + border-color: #eed3d7; +} +.table-hover > tbody > tr > td.danger:hover, +.table-hover > tbody > tr > th.danger:hover, +.table-hover > tbody > tr.danger:hover > td { + background-color: #ebcccc; + border-color: #e6c1c7; +} +.table > thead > tr > td.warning, +.table > thead > tr > th.warning, +.table > thead > tr.warning > td, +.table > thead > tr.warning > th, +.table > tbody > tr > td.warning, +.table > tbody > tr > th.warning, +.table > tbody > tr.warning > td, +.table > tbody > tr.warning > th, +.table > tfoot > tr > td.warning, +.table > tfoot > tr > th.warning, +.table > tfoot > tr.warning > td, +.table > tfoot > tr.warning > th { + background-color: #fcf8e3; + border-color: #fbeed5; +} +.table-hover > tbody > tr > td.warning:hover, +.table-hover > tbody > tr > th.warning:hover, +.table-hover > tbody > tr.warning:hover > td { + background-color: #faf2cc; + border-color: #f8e5be; +} +@media (max-width: 768px) { + .table-responsive { + width: 100%; + margin-bottom: 15px; + overflow-y: hidden; + overflow-x: scroll; + border: 1px solid #ddd; + } + .table-responsive > .table { + margin-bottom: 0; + background-color: #fff; + } + .table-responsive > .table > thead > tr > th, + .table-responsive > .table > thead > tr > td, + .table-responsive > .table > tbody > tr > th, + .table-responsive > .table > tbody > tr > td, + .table-responsive > .table > tfoot > tr > th, + .table-responsive > .table > tfoot > tr > td { + white-space: nowrap; + } + .table-responsive > .table-bordered { + border: 0; + } + .table-responsive > .table-bordered > thead > tr > th:first-child, + .table-responsive > .table-bordered > thead > tr > td:first-child, + .table-responsive > .table-bordered > tbody > tr > th:first-child, + .table-responsive > .table-bordered > tbody > tr > td:first-child, + .table-responsive > .table-bordered > tfoot > tr > th:first-child, + .table-responsive > .table-bordered > tfoot > tr > td:first-child { + border-left: 0; + } + .table-responsive > .table-bordered > thead > tr > th:last-child, + .table-responsive > .table-bordered > thead > tr > td:last-child, + .table-responsive > .table-bordered > tbody > tr > th:last-child, + .table-responsive > .table-bordered > tbody > tr > td:last-child, + .table-responsive > .table-bordered > tfoot > tr > th:last-child, + .table-responsive > .table-bordered > tfoot > tr > td:last-child { + border-right: 0; + } + .table-responsive > .table-bordered > thead > tr:last-child > th, + .table-responsive > .table-bordered > thead > tr:last-child > td, + .table-responsive > .table-bordered > tbody > tr:last-child > th, + .table-responsive > .table-bordered > tbody > tr:last-child > td, + .table-responsive > .table-bordered > tfoot > tr:last-child > th, + .table-responsive > .table-bordered > tfoot > tr:last-child > td { + border-bottom: 0; + } +} +fieldset { + padding: 0; + margin: 0; + border: 0; +} +legend { + display: block; + width: 100%; + padding: 0; + margin-bottom: 18px; + font-size: 19.5px; + line-height: inherit; + color: #333333; + border: 0; + border-bottom: 1px solid #e5e5e5; +} +label { + display: inline-block; + margin-bottom: 5px; + font-weight: bold; +} +input[type="search"] { + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box; +} +input[type="radio"], +input[type="checkbox"] { + margin: 4px 0 0; + margin-top: 1px \9; + line-height: normal; +} +input[type="file"] { + display: block; +} +select[multiple], +select[size] { + height: auto; +} +select optgroup { + font-size: inherit; + font-style: inherit; + font-family: inherit; +} +input[type="file"]:focus, +input[type="radio"]:focus, +input[type="checkbox"]:focus { + outline: thin dotted #333; + outline: 5px auto -webkit-focus-ring-color; + outline-offset: -2px; +} +input[type="number"]::-webkit-outer-spin-button, +input[type="number"]::-webkit-inner-spin-button { + height: auto; +} +.form-control:-moz-placeholder { + color: #999999; +} +.form-control::-moz-placeholder { + color: #999999; +} +.form-control:-ms-input-placeholder { + color: #999999; +} +.form-control::-webkit-input-placeholder { + color: #999999; +} +.form-control { + display: block; + width: 100%; + height: 32px; + padding: 6px 12px; + font-size: 13px; + line-height: 1.428571429; + color: #555555; + vertical-align: middle; + background-color: #fff; + border: 1px solid #ccc; + border-radius: 4px; + -webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,0.075); + box-shadow: inset 0 1px 1px rgba(0,0,0,0.075); + -webkit-transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s; + transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s; +} +.form-control:focus { + border-color: #e9720f; + outline: 0; + -webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(233,114,15,0.6); + box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(233,114,15,0.6); +} +.form-control[disabled], +.form-control[readonly], +fieldset[disabled] .form-control { + cursor: not-allowed; + background-color: #eeeeee; +} +textarea.form-control { + height: auto; +} +.form-group { + margin-bottom: 15px; +} +.radio, +.checkbox { + display: block; + min-height: 18px; + margin-top: 10px; + margin-bottom: 10px; + padding-left: 20px; + vertical-align: middle; +} +.radio label, +.checkbox label { + display: inline; + margin-bottom: 0; + font-weight: normal; + cursor: pointer; +} +.radio input[type="radio"], +.radio-inline input[type="radio"], +.checkbox input[type="checkbox"], +.checkbox-inline input[type="checkbox"] { + float: left; + margin-left: -20px; +} +.radio + .radio, +.checkbox + .checkbox { + margin-top: -5px; +} +.radio-inline, +.checkbox-inline { + display: inline-block; + padding-left: 20px; + margin-bottom: 0; + vertical-align: middle; + font-weight: normal; + cursor: pointer; +} +.radio-inline + .radio-inline, +.checkbox-inline + .checkbox-inline { + margin-top: 0; + margin-left: 10px; +} +input[type="radio"][disabled], +fieldset[disabled] input[type="radio"], +input[type="checkbox"][disabled], +fieldset[disabled] input[type="checkbox"], +.radio[disabled], +fieldset[disabled] .radio, +.radio-inline[disabled], +fieldset[disabled] .radio-inline, +.checkbox[disabled], +fieldset[disabled] .checkbox, +.checkbox-inline[disabled], +fieldset[disabled] .checkbox-inline { + cursor: not-allowed; +} +.input-sm { + height: 30px; + padding: 5px 10px; + font-size: 12px; + line-height: 1.5; + border-radius: 3px; +} +select.input-sm { + height: 30px; + line-height: 30px; +} +textarea.input-sm { + height: auto; +} +.input-lg { + height: 44px; + padding: 10px 16px; + font-size: 17px; + line-height: 1.33; + border-radius: 6px; +} +select.input-lg { + height: 44px; + line-height: 44px; +} +textarea.input-lg { + height: auto; +} +.has-warning .help-block, +.has-warning .control-label { + color: #c09853; +} +.has-warning .form-control { + border-color: #c09853; + -webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,0.075); + box-shadow: inset 0 1px 1px rgba(0,0,0,0.075); +} +.has-warning .form-control:focus { + border-color: #a47e3c; + -webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,0.075), 0 0 6px #dbc59e; + box-shadow: inset 0 1px 1px rgba(0,0,0,0.075), 0 0 6px #dbc59e; +} +.has-warning .input-group-addon { + color: #c09853; + border-color: #c09853; + background-color: #fcf8e3; +} +.has-error .help-block, +.has-error .control-label { + color: #b94a48; +} +.has-error .form-control { + border-color: #b94a48; + -webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,0.075); + box-shadow: inset 0 1px 1px rgba(0,0,0,0.075); +} +.has-error .form-control:focus { + border-color: #953b39; + -webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,0.075), 0 0 6px #d59392; + box-shadow: inset 0 1px 1px rgba(0,0,0,0.075), 0 0 6px #d59392; +} +.has-error .input-group-addon { + color: #b94a48; + border-color: #b94a48; + background-color: #f2dede; +} +.has-success .help-block, +.has-success .control-label { + color: #468847; +} +.has-success .form-control { + border-color: #468847; + -webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,0.075); + box-shadow: inset 0 1px 1px rgba(0,0,0,0.075); +} +.has-success .form-control:focus { + border-color: #356635; + -webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,0.075), 0 0 6px #7aba7b; + box-shadow: inset 0 1px 1px rgba(0,0,0,0.075), 0 0 6px #7aba7b; +} +.has-success .input-group-addon { + color: #468847; + border-color: #468847; + background-color: #dff0d8; +} +.form-control-static { + margin-bottom: 0; + padding-top: 7px; +} +.help-block { + display: block; + margin-top: 5px; + margin-bottom: 10px; + color: #737373; +} +@media (min-width: 768px) { + .form-inline .form-group { + display: inline-block; + margin-bottom: 0; + vertical-align: middle; + } + .form-inline .form-control { + display: inline-block; + } + .form-inline .radio, + .form-inline .checkbox { + display: inline-block; + margin-top: 0; + margin-bottom: 0; + padding-left: 0; + } + .form-inline .radio input[type="radio"], + .form-inline .checkbox input[type="checkbox"] { + float: none; + margin-left: 0; + } +} +.form-horizontal .control-label, +.form-horizontal .radio, +.form-horizontal .checkbox, +.form-horizontal .radio-inline, +.form-horizontal .checkbox-inline { + margin-top: 0; + margin-bottom: 0; + padding-top: 7px; +} +.form-horizontal .form-group { + margin-left: -15px; + margin-right: -15px; +} +.form-horizontal .form-group:before, +.form-horizontal .form-group:after { + content: " "; + display: table; +} +.form-horizontal .form-group:after { + clear: both; +} +.form-horizontal .form-group:before, +.form-horizontal .form-group:after { + content: " "; + display: table; +} +.form-horizontal .form-group:after { + clear: both; +} +@media (min-width: 768px) { + .form-horizontal .control-label { + text-align: right; + } +} +.btn { + display: inline-block; + padding: 6px 12px; + margin-bottom: 0; + font-size: 13px; + font-weight: normal; + line-height: 1.428571429; + text-align: center; + vertical-align: middle; + cursor: pointer; + border: 1px solid transparent; + border-radius: 4px; + white-space: nowrap; + -webkit-user-select: none; + -moz-user-select: none; + -ms-user-select: none; + -o-user-select: none; + user-select: none; +} +.btn:focus { + outline: thin dotted #333; + outline: 5px auto -webkit-focus-ring-color; + outline-offset: -2px; +} +.btn:hover, +.btn:focus { + color: #333; + text-decoration: none; +} +.btn:active, +.btn.active { + outline: 0; + background-image: none; + -webkit-box-shadow: inset 0 3px 5px rgba(0,0,0,0.125); + box-shadow: inset 0 3px 5px rgba(0,0,0,0.125); +} +.btn.disabled, +.btn[disabled], +fieldset[disabled] .btn { + cursor: not-allowed; + pointer-events: none; + opacity: .65; + filter: alpha(opacity=65); + -webkit-box-shadow: none; + box-shadow: none; +} +.btn-default { + color: #333; + background-color: #fff; + border-color: #ccc; +} +.btn-default:hover, +.btn-default:focus, +.btn-default:active, +.btn-default.active, +.open .dropdown-toggle.btn-default { + color: #333; + background-color: #ebebeb; + border-color: #adadad; +} +.btn-default:active, +.btn-default.active, +.open .dropdown-toggle.btn-default { + background-image: none; +} +.btn-default.disabled, +.btn-default.disabled:hover, +.btn-default.disabled:focus, +.btn-default.disabled:active, +.btn-default.disabled.active, +.btn-default[disabled], +.btn-default[disabled]:hover, +.btn-default[disabled]:focus, +.btn-default[disabled]:active, +.btn-default[disabled].active, +fieldset[disabled] .btn-default, +fieldset[disabled] .btn-default:hover, +fieldset[disabled] .btn-default:focus, +fieldset[disabled] .btn-default:active, +fieldset[disabled] .btn-default.active { + background-color: #fff; + border-color: #ccc; +} +.btn-primary { + color: #fff; + background-color: #f39922; + border-color: #ef8d0d; +} +.btn-primary:hover, +.btn-primary:focus, +.btn-primary:active, +.btn-primary.active, +.open .dropdown-toggle.btn-primary { + color: #fff; + background-color: #e0850c; + border-color: #b46b0a; +} +.btn-primary:active, +.btn-primary.active, +.open .dropdown-toggle.btn-primary { + background-image: none; +} +.btn-primary.disabled, +.btn-primary.disabled:hover, +.btn-primary.disabled:focus, +.btn-primary.disabled:active, +.btn-primary.disabled.active, +.btn-primary[disabled], +.btn-primary[disabled]:hover, +.btn-primary[disabled]:focus, +.btn-primary[disabled]:active, +.btn-primary[disabled].active, +fieldset[disabled] .btn-primary, +fieldset[disabled] .btn-primary:hover, +fieldset[disabled] .btn-primary:focus, +fieldset[disabled] .btn-primary:active, +fieldset[disabled] .btn-primary.active { + background-color: #f39922; + border-color: #ef8d0d; +} +.btn-warning { + color: #fff; + background-color: #f0ad4e; + border-color: #eea236; +} +.btn-warning:hover, +.btn-warning:focus, +.btn-warning:active, +.btn-warning.active, +.open .dropdown-toggle.btn-warning { + color: #fff; + background-color: #ed9c28; + border-color: #d58512; +} +.btn-warning:active, +.btn-warning.active, +.open .dropdown-toggle.btn-warning { + background-image: none; +} +.btn-warning.disabled, +.btn-warning.disabled:hover, +.btn-warning.disabled:focus, +.btn-warning.disabled:active, +.btn-warning.disabled.active, +.btn-warning[disabled], +.btn-warning[disabled]:hover, +.btn-warning[disabled]:focus, +.btn-warning[disabled]:active, +.btn-warning[disabled].active, +fieldset[disabled] .btn-warning, +fieldset[disabled] .btn-warning:hover, +fieldset[disabled] .btn-warning:focus, +fieldset[disabled] .btn-warning:active, +fieldset[disabled] .btn-warning.active { + background-color: #f0ad4e; + border-color: #eea236; +} +.btn-danger { + color: #fff; + background-color: #d9534f; + border-color: #d43f3a; +} +.btn-danger:hover, +.btn-danger:focus, +.btn-danger:active, +.btn-danger.active, +.open .dropdown-toggle.btn-danger { + color: #fff; + background-color: #d2322d; + border-color: #ac2925; +} +.btn-danger:active, +.btn-danger.active, +.open .dropdown-toggle.btn-danger { + background-image: none; +} +.btn-danger.disabled, +.btn-danger.disabled:hover, +.btn-danger.disabled:focus, +.btn-danger.disabled:active, +.btn-danger.disabled.active, +.btn-danger[disabled], +.btn-danger[disabled]:hover, +.btn-danger[disabled]:focus, +.btn-danger[disabled]:active, +.btn-danger[disabled].active, +fieldset[disabled] .btn-danger, +fieldset[disabled] .btn-danger:hover, +fieldset[disabled] .btn-danger:focus, +fieldset[disabled] .btn-danger:active, +fieldset[disabled] .btn-danger.active { + background-color: #d9534f; + border-color: #d43f3a; +} +.btn-success { + color: #fff; + background-color: #5cb85c; + border-color: #4cae4c; +} +.btn-success:hover, +.btn-success:focus, +.btn-success:active, +.btn-success.active, +.open .dropdown-toggle.btn-success { + color: #fff; + background-color: #47a447; + border-color: #398439; +} +.btn-success:active, +.btn-success.active, +.open .dropdown-toggle.btn-success { + background-image: none; +} +.btn-success.disabled, +.btn-success.disabled:hover, +.btn-success.disabled:focus, +.btn-success.disabled:active, +.btn-success.disabled.active, +.btn-success[disabled], +.btn-success[disabled]:hover, +.btn-success[disabled]:focus, +.btn-success[disabled]:active, +.btn-success[disabled].active, +fieldset[disabled] .btn-success, +fieldset[disabled] .btn-success:hover, +fieldset[disabled] .btn-success:focus, +fieldset[disabled] .btn-success:active, +fieldset[disabled] .btn-success.active { + background-color: #5cb85c; + border-color: #4cae4c; +} +.btn-info { + color: #fff; + background-color: #5bc0de; + border-color: #46b8da; +} +.btn-info:hover, +.btn-info:focus, +.btn-info:active, +.btn-info.active, +.open .dropdown-toggle.btn-info { + color: #fff; + background-color: #39b3d7; + border-color: #269abc; +} +.btn-info:active, +.btn-info.active, +.open .dropdown-toggle.btn-info { + background-image: none; +} +.btn-info.disabled, +.btn-info.disabled:hover, +.btn-info.disabled:focus, +.btn-info.disabled:active, +.btn-info.disabled.active, +.btn-info[disabled], +.btn-info[disabled]:hover, +.btn-info[disabled]:focus, +.btn-info[disabled]:active, +.btn-info[disabled].active, +fieldset[disabled] .btn-info, +fieldset[disabled] .btn-info:hover, +fieldset[disabled] .btn-info:focus, +fieldset[disabled] .btn-info:active, +fieldset[disabled] .btn-info.active { + background-color: #5bc0de; + border-color: #46b8da; +} +.btn-link { + color: #e9720f; + font-weight: normal; + cursor: pointer; + border-radius: 0; +} +.btn-link, +.btn-link:active, +.btn-link[disabled], +fieldset[disabled] .btn-link { + background-color: transparent; + -webkit-box-shadow: none; + box-shadow: none; +} +.btn-link, +.btn-link:hover, +.btn-link:focus, +.btn-link:active { + border-color: transparent; +} +.btn-link:hover, +.btn-link:focus { + color: #a14f0a; + text-decoration: underline; + background-color: transparent; +} +.btn-link[disabled]:hover, +.btn-link[disabled]:focus, +fieldset[disabled] .btn-link:hover, +fieldset[disabled] .btn-link:focus { + color: #999999; + text-decoration: none; +} +.btn-lg { + padding: 10px 16px; + font-size: 17px; + line-height: 1.33; + border-radius: 6px; +} +.btn-sm, +.btn-xs { + padding: 5px 10px; + font-size: 12px; + line-height: 1.5; + border-radius: 3px; +} +.btn-xs { + padding: 1px 5px; +} +.btn-block { + display: block; + width: 100%; + padding-left: 0; + padding-right: 0; +} +.btn-block + .btn-block { + margin-top: 5px; +} +input[type="submit"].btn-block, +input[type="reset"].btn-block, +input[type="button"].btn-block { + width: 100%; +} +.fade { + opacity: 0; + -webkit-transition: opacity .15s linear; + transition: opacity .15s linear; +} +.fade.in { + opacity: 1; +} +.collapse { + display: none; +} +.collapse.in { + display: block; +} +.collapsing { + position: relative; + height: 0; + overflow: hidden; + -webkit-transition: height .35s ease; + transition: height .35s ease; +} +@font-face { + font-family: 'Glyphicons Halflings'; + src: url(data:application/vnd.ms-fontobject;base64,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); + src: url('../fonts/bootstrap/glyphicons-halflings-regular.eot?#iefix') format('embedded-opentype'), url(data:application/octet-stream;base64,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) format('woff'), url(data:application/x-font-ttf;base64,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ACAAMQAuADAALgA3ADAAOwBtAGEAawBlAG8AdABmAC4AbABpAGIAMgAuADUALgA1ADgAMwAyADkARwBMAFkAUABIAEkAQwBPAE4AUwBIAGEAbABmAGwAaQBuAGcAcwAtAFIAZQBnAHUAbABhAHIASgBhAG4AIABLAG8AdgBhAHIAaQBrAEoAYQBuACAASwBvAHYAYQByAGkAawB3AHcAdwAuAGcAbAB5AHAAaABpAGMAbwBuAHMALgBjAG8AbQB3AHcAdwAuAGcAbAB5AHAAaABpAGMAbwBuAHMALgBjAG8AbQB3AHcAdwAuAGcAbAB5AHAAaABpAGMAbwBuAHMALgBjAG8AbQBXAGUAYgBmAG8AbgB0ACAAMQAuADAATQBvAG4AIABKAHUAbAAgACAAMQAgADAANQA6ADIANgA6ADAAMAAgADIAMAAxADMAAgAAAAAAAP+1ADIAAAAAAAAAAAAAAAAAAAAAAAAAAADbAAABAgEDAAMADQAOAQQBBQEGAQcBCAEJAQoBCwEMAQ0BDgEPARABEQESAO8BEwEUARUBFgEXARgBGQEaARsBHAEdAR4BHwEgASEBIgEjASQBJQEmAScBKAEpASoBKwEsAS0BLgEvATABMQEyATMBNAE1ATYBNwE4ATkBOgE7ATwBPQE+AT8BQAFBAUIBQwFEAUUBRgFHAUgBSQFKAUsBTAFNAU4BTwFQAVEBUgFTAVQBVQFWAVcBWAFZAVoBWwFcAV0BXgFfAWABYQFiAWMBZAFlAWYBZwFoAWkBagFrAWwBbQFuAW8BcAFxAXIBcwF0AXUBdgF3AXgBeQF6AXsBfAF9AX4BfwGAAYEBggGDAYQBhQGGAYcBiAGJAYoBiwGMAY0BjgGPAZABkQGSAZMBlAGVAZYBlwGYAZkBmgGbAZwBnQGeAZ8BoAGhAaIBowGkAaUBpgGnAagBqQGqAasBrAGtAa4BrwGwAbEBsgGzAbQBtQG2AbcBuAG5AboBuwG8Ab0BvgG/AcABwQHCAcMBxAHFAcYBxwHIAckBygHLAcwBzQHOAc8B0AHRAdIB0wHUAdUB1gHXBmdseXBoMQZnbHlwaDIHdW5pMDBBMAd1bmkyMDAwB3VuaTIwMDEHdW5pMjAwMgd1bmkyMDAzB3VuaTIwMDQHdW5pMjAwNQd1bmkyMDA2B3VuaTIwMDcHdW5pMjAwOAd1bmkyMDA5B3VuaTIwMEEHdW5pMjAyRgd1bmkyMDVGBEV1cm8HdW5pMjYwMQd1bmkyNzA5B3VuaTI3MEYHdW5pRTAwMAd1bmlFMDAxB3VuaUUwMDIHdW5pRTAwMwd1bmlFMDA1B3VuaUUwMDYHdW5pRTAwNwd1bmlFMDA4B3VuaUUwMDkHdW5pRTAxMAd1bmlFMDExB3VuaUUwMTIHdW5pRTAxMwd1bmlFMDE0B3VuaUUwMTUHdW5pRTAxNgd1bmlFMDE3B3VuaUUwMTgHdW5pRTAxOQd1bmlFMDIwB3VuaUUwMjEHdW5pRTAyMgd1bmlFMDIzB3VuaUUwMjQHdW5pRTAyNQd1bmlFMDI2B3VuaUUwMjcHdW5pRTAyOAd1bmlFMDI5B3VuaUUwMzAHdW5pRTAzMQd1bmlFMDMyB3VuaUUwMzQHdW5pRTAzNQd1bmlFMDM2B3VuaUUwMzcHdW5pRTAzOAd1bmlFMDM5B3VuaUUwNDAHdW5pRTA0MQd1bmlFMDQyB3VuaUUwNDMHdW5pRTA0NQd1bmlFMDQ3B3VuaUUwNDgHdW5pRTA0OQd1bmlFMDUwB3VuaUUwNTEHdW5pRTA1Mgd1bmlFMDUzB3VuaUUwNTQHdW5pRTA1NQd1bmlFMDU2B3VuaUUwNTcHdW5pRTA1OAd1bmlFMDU5B3VuaUUwNjAHdW5pRTA2Mgd1bmlFMDYzB3VuaUUwNjQHdW5pRTA2NQd1bmlFMDY2B3VuaUUwNjcHdW5pRTA2OAd1bmlFMDY5B3VuaUUwNzAHdW5pRTA3MQd1bmlFMDcyB3VuaUUwNzMHdW5pRTA3NAd1bmlFMDc1B3VuaUUwNzYHdW5pRTA3Nwd1bmlFMDc4B3VuaUUwNzkHdW5pRTA4MAd1bmlFMDgxB3VuaUUwODIHdW5pRTA4Mwd1bmlFMDg0B3VuaUUwODUHdW5pRTA4Ngd1bmlFMDg3B3VuaUUwODgHdW5pRTA4OQd1bmlFMDkwB3VuaUUwOTEHdW5pRTA5Mgd1bmlFMDkzB3VuaUUwOTQHdW5pRTA5NQd1bmlFMDk2B3VuaUUwOTcHdW5pRTEwMQd1bmlFMTAyB3VuaUUxMDMHdW5pRTEwNQd1bmlFMTA2B3VuaUUxMDcHdW5pRTEwOAd1bmlFMTEwB3VuaUUxMTEHdW5pRTExMgd1bmlFMTEzB3VuaUUxMTQHdW5pRTExNQd1bmlFMTE2B3VuaUUxMTcHdW5pRTExOAd1bmlFMTE5B3VuaUUxMjAHdW5pRTEyMQd1bmlFMTIyB3VuaUUxMjQHdW5pRTEyNQd1bmlFMTI2B3VuaUUxMjcHdW5pRTEyOAd1bmlFMTI5B3VuaUUxMzAHdW5pRTEzMQd1bmlFMTMyB3VuaUUxMzMHdW5pRTEzNAd1bmlFMTM1B3VuaUUxMzcHdW5pRTEzOAd1bmlFMTQwB3VuaUUxNDEHdW5pRTE0Mwd1bmlFMTQ0B3VuaUUxNDUHdW5pRTE0OAd1bmlFMTQ5B3VuaUUxNTAHdW5pRTE1MQd1bmlFMTUyB3VuaUUxNTMHdW5pRTE1NAd1bmlFMTU1B3VuaUUxNTYHdW5pRTE1Nwd1bmlFMTU4B3VuaUUxNTkHdW5pRTE2MAd1bmlFMTYxB3VuaUUxNjIHdW5pRTE2Mwd1bmlFMTY0B3VuaUUxNjUHdW5pRTE2Ngd1bmlFMTY3B3VuaUUxNjgHdW5pRTE2OQd1bmlFMTcwB3VuaUUxNzEHdW5pRTE3Mgd1bmlFMTczB3VuaUUxNzQHdW5pRTE3NQd1bmlFMTc2B3VuaUUxNzcHdW5pRTE3OAd1bmlFMTc5B3VuaUUxODAHdW5pRTE4MQd1bmlFMTgyB3VuaUUxODMHdW5pRTE4NAd1bmlFMTg1B3VuaUUxODYHdW5pRTE4Nwd1bmlFMTg4B3VuaUUxODkHdW5pRTE5MAd1bmlFMTkxB3VuaUUxOTIHdW5pRTE5Mwd1bmlFMTk0B3VuaUUxOTUHdW5pRTE5Nwd1bmlFMTk4B3VuaUUxOTkHdW5pRTIwMAZ1MUY0QkMGdTFGNEM1BnUxRjRDQwZ1MUY0Q0UGdTFGNEY3BnUxRjUxMgZ1MUY1MTQGdTFGNTE2BnUxRjUyNQZ1MUY1MjcAAAAAAVHRSygAAA==) format('truetype'), url('../fonts/bootstrap/glyphicons-halflings-regular.svg#glyphicons-halflingsregular') format('svg'); +} +.glyphicon { + position: relative; + top: 1px; + display: inline-block; + font-family: 'Glyphicons Halflings'; + font-style: normal; + font-weight: normal; + line-height: 1; + -webkit-font-smoothing: antialiased; +} +.glyphicon-asterisk:before { + content: "\2a"; +} +.glyphicon-plus:before { + content: "\2b"; +} +.glyphicon-euro:before { + content: "\20ac"; +} +.glyphicon-minus:before { + content: "\2212"; +} +.glyphicon-cloud:before { + content: "\2601"; +} +.glyphicon-envelope:before { + content: "\2709"; +} +.glyphicon-pencil:before { + content: "\270f"; +} +.glyphicon-glass:before { + content: "\e001"; +} +.glyphicon-music:before { + content: "\e002"; +} +.glyphicon-search:before { + content: "\e003"; +} +.glyphicon-heart:before { + content: "\e005"; +} +.glyphicon-star:before { + content: "\e006"; +} +.glyphicon-star-empty:before { + content: "\e007"; +} +.glyphicon-user:before { + content: "\e008"; +} +.glyphicon-film:before { + content: "\e009"; +} +.glyphicon-th-large:before { + content: "\e010"; +} +.glyphicon-th:before { + content: "\e011"; +} +.glyphicon-th-list:before { + content: "\e012"; +} +.glyphicon-ok:before { + content: "\e013"; +} +.glyphicon-remove:before { + content: "\e014"; +} +.glyphicon-zoom-in:before { + content: "\e015"; +} +.glyphicon-zoom-out:before { + content: "\e016"; +} +.glyphicon-off:before { + content: "\e017"; +} +.glyphicon-signal:before { + content: "\e018"; +} +.glyphicon-cog:before { + content: "\e019"; +} +.glyphicon-trash:before { + content: "\e020"; +} +.glyphicon-home:before { + content: "\e021"; +} +.glyphicon-file:before { + content: "\e022"; +} +.glyphicon-time:before { + content: "\e023"; +} +.glyphicon-road:before { + content: "\e024"; +} +.glyphicon-download-alt:before { + content: "\e025"; +} +.glyphicon-download:before { + content: "\e026"; +} +.glyphicon-upload:before { + content: "\e027"; +} +.glyphicon-inbox:before { + content: "\e028"; +} +.glyphicon-play-circle:before { + content: "\e029"; +} +.glyphicon-repeat:before { + content: "\e030"; +} +.glyphicon-refresh:before { + content: "\e031"; +} +.glyphicon-list-alt:before { + content: "\e032"; +} +.glyphicon-flag:before { + content: "\e034"; +} +.glyphicon-headphones:before { + content: "\e035"; +} +.glyphicon-volume-off:before { + content: "\e036"; +} +.glyphicon-volume-down:before { + content: "\e037"; +} +.glyphicon-volume-up:before { + content: "\e038"; +} +.glyphicon-qrcode:before { + content: "\e039"; +} +.glyphicon-barcode:before { + content: "\e040"; +} +.glyphicon-tag:before { + content: "\e041"; +} +.glyphicon-tags:before { + content: "\e042"; +} +.glyphicon-book:before { + content: "\e043"; +} +.glyphicon-print:before { + content: "\e045"; +} +.glyphicon-font:before { + content: "\e047"; +} +.glyphicon-bold:before { + content: "\e048"; +} +.glyphicon-italic:before { + content: "\e049"; +} +.glyphicon-text-height:before { + content: "\e050"; +} +.glyphicon-text-width:before { + content: "\e051"; +} +.glyphicon-align-left:before { + content: "\e052"; +} +.glyphicon-align-center:before { + content: "\e053"; +} +.glyphicon-align-right:before { + content: "\e054"; +} +.glyphicon-align-justify:before { + content: "\e055"; +} +.glyphicon-list:before { + content: "\e056"; +} +.glyphicon-indent-left:before { + content: "\e057"; +} +.glyphicon-indent-right:before { + content: "\e058"; +} +.glyphicon-facetime-video:before { + content: "\e059"; +} +.glyphicon-picture:before { + content: "\e060"; +} +.glyphicon-map-marker:before { + content: "\e062"; +} +.glyphicon-adjust:before { + content: "\e063"; +} +.glyphicon-tint:before { + content: "\e064"; +} +.glyphicon-edit:before { + content: "\e065"; +} +.glyphicon-share:before { + content: "\e066"; +} +.glyphicon-check:before { + content: "\e067"; +} +.glyphicon-move:before { + content: "\e068"; +} +.glyphicon-step-backward:before { + content: "\e069"; +} +.glyphicon-fast-backward:before { + content: "\e070"; +} +.glyphicon-backward:before { + content: "\e071"; +} +.glyphicon-play:before { + content: "\e072"; +} +.glyphicon-pause:before { + content: "\e073"; +} +.glyphicon-stop:before { + content: "\e074"; +} +.glyphicon-forward:before { + content: "\e075"; +} +.glyphicon-fast-forward:before { + content: "\e076"; +} +.glyphicon-step-forward:before { + content: "\e077"; +} +.glyphicon-eject:before { + content: "\e078"; +} +.glyphicon-chevron-left:before { + content: "\e079"; +} +.glyphicon-chevron-right:before { + content: "\e080"; +} +.glyphicon-plus-sign:before { + content: "\e081"; +} +.glyphicon-minus-sign:before { + content: "\e082"; +} +.glyphicon-remove-sign:before { + content: "\e083"; +} +.glyphicon-ok-sign:before { + content: "\e084"; +} +.glyphicon-question-sign:before { + content: "\e085"; +} +.glyphicon-info-sign:before { + content: "\e086"; +} +.glyphicon-screenshot:before { + content: "\e087"; +} +.glyphicon-remove-circle:before { + content: "\e088"; +} +.glyphicon-ok-circle:before { + content: "\e089"; +} +.glyphicon-ban-circle:before { + content: "\e090"; +} +.glyphicon-arrow-left:before { + content: "\e091"; +} +.glyphicon-arrow-right:before { + content: "\e092"; +} +.glyphicon-arrow-up:before { + content: "\e093"; +} +.glyphicon-arrow-down:before { + content: "\e094"; +} +.glyphicon-share-alt:before { + content: "\e095"; +} +.glyphicon-resize-full:before { + content: "\e096"; +} +.glyphicon-resize-small:before { + content: "\e097"; +} +.glyphicon-exclamation-sign:before { + content: "\e101"; +} +.glyphicon-gift:before { + content: "\e102"; +} +.glyphicon-leaf:before { + content: "\e103"; +} +.glyphicon-eye-open:before { + content: "\e105"; +} +.glyphicon-eye-close:before { + content: "\e106"; +} +.glyphicon-warning-sign:before { + content: "\e107"; +} +.glyphicon-plane:before { + content: "\e108"; +} +.glyphicon-random:before { + content: "\e110"; +} +.glyphicon-comment:before { + content: "\e111"; +} +.glyphicon-magnet:before { + content: "\e112"; +} +.glyphicon-chevron-up:before { + content: "\e113"; +} +.glyphicon-chevron-down:before { + content: "\e114"; +} +.glyphicon-retweet:before { + content: "\e115"; +} +.glyphicon-shopping-cart:before { + content: "\e116"; +} +.glyphicon-folder-close:before { + content: "\e117"; +} +.glyphicon-folder-open:before { + content: "\e118"; +} +.glyphicon-resize-vertical:before { + content: "\e119"; +} +.glyphicon-resize-horizontal:before { + content: "\e120"; +} +.glyphicon-hdd:before { + content: "\e121"; +} +.glyphicon-bullhorn:before { + content: "\e122"; +} +.glyphicon-certificate:before { + content: "\e124"; +} +.glyphicon-thumbs-up:before { + content: "\e125"; +} +.glyphicon-thumbs-down:before { + content: "\e126"; +} +.glyphicon-hand-right:before { + content: "\e127"; +} +.glyphicon-hand-left:before { + content: "\e128"; +} +.glyphicon-hand-up:before { + content: "\e129"; +} +.glyphicon-hand-down:before { + content: "\e130"; +} +.glyphicon-circle-arrow-right:before { + content: "\e131"; +} +.glyphicon-circle-arrow-left:before { + content: "\e132"; +} +.glyphicon-circle-arrow-up:before { + content: "\e133"; +} +.glyphicon-circle-arrow-down:before { + content: "\e134"; +} +.glyphicon-globe:before { + content: "\e135"; +} +.glyphicon-tasks:before { + content: "\e137"; +} +.glyphicon-filter:before { + content: "\e138"; +} +.glyphicon-fullscreen:before { + content: "\e140"; +} +.glyphicon-dashboard:before { + content: "\e141"; +} +.glyphicon-heart-empty:before { + content: "\e143"; +} +.glyphicon-link:before { + content: "\e144"; +} +.glyphicon-phone:before { + content: "\e145"; +} +.glyphicon-usd:before { + content: "\e148"; +} +.glyphicon-gbp:before { + content: "\e149"; +} +.glyphicon-sort:before { + content: "\e150"; +} +.glyphicon-sort-by-alphabet:before { + content: "\e151"; +} +.glyphicon-sort-by-alphabet-alt:before { + content: "\e152"; +} +.glyphicon-sort-by-order:before { + content: "\e153"; +} +.glyphicon-sort-by-order-alt:before { + content: "\e154"; +} +.glyphicon-sort-by-attributes:before { + content: "\e155"; +} +.glyphicon-sort-by-attributes-alt:before { + content: "\e156"; +} +.glyphicon-unchecked:before { + content: "\e157"; +} +.glyphicon-expand:before { + content: "\e158"; +} +.glyphicon-collapse-down:before { + content: "\e159"; +} +.glyphicon-collapse-up:before { + content: "\e160"; +} +.glyphicon-log-in:before { + content: "\e161"; +} +.glyphicon-flash:before { + content: "\e162"; +} +.glyphicon-log-out:before { + content: "\e163"; +} +.glyphicon-new-window:before { + content: "\e164"; +} +.glyphicon-record:before { + content: "\e165"; +} +.glyphicon-save:before { + content: "\e166"; +} +.glyphicon-open:before { + content: "\e167"; +} +.glyphicon-saved:before { + content: "\e168"; +} +.glyphicon-import:before { + content: "\e169"; +} +.glyphicon-export:before { + content: "\e170"; +} +.glyphicon-send:before { + content: "\e171"; +} +.glyphicon-floppy-disk:before { + content: "\e172"; +} +.glyphicon-floppy-saved:before { + content: "\e173"; +} +.glyphicon-floppy-remove:before { + content: "\e174"; +} +.glyphicon-floppy-save:before { + content: "\e175"; +} +.glyphicon-floppy-open:before { + content: "\e176"; +} +.glyphicon-credit-card:before { + content: "\e177"; +} +.glyphicon-transfer:before { + content: "\e178"; +} +.glyphicon-cutlery:before { + content: "\e179"; +} +.glyphicon-header:before { + content: "\e180"; +} +.glyphicon-compressed:before { + content: "\e181"; +} +.glyphicon-earphone:before { + content: "\e182"; +} +.glyphicon-phone-alt:before { + content: "\e183"; +} +.glyphicon-tower:before { + content: "\e184"; +} +.glyphicon-stats:before { + content: "\e185"; +} +.glyphicon-sd-video:before { + content: "\e186"; +} +.glyphicon-hd-video:before { + content: "\e187"; +} +.glyphicon-subtitles:before { + content: "\e188"; +} +.glyphicon-sound-stereo:before { + content: "\e189"; +} +.glyphicon-sound-dolby:before { + content: "\e190"; +} +.glyphicon-sound-5-1:before { + content: "\e191"; +} +.glyphicon-sound-6-1:before { + content: "\e192"; +} +.glyphicon-sound-7-1:before { + content: "\e193"; +} +.glyphicon-copyright-mark:before { + content: "\e194"; +} +.glyphicon-registration-mark:before { + content: "\e195"; +} +.glyphicon-cloud-download:before { + content: "\e197"; +} +.glyphicon-cloud-upload:before { + content: "\e198"; +} +.glyphicon-tree-conifer:before { + content: "\e199"; +} +.glyphicon-tree-deciduous:before { + content: "\e200"; +} +.glyphicon-briefcase:before { + content: "\1f4bc"; +} +.glyphicon-calendar:before { + content: "\1f4c5"; +} +.glyphicon-pushpin:before { + content: "\1f4cc"; +} +.glyphicon-paperclip:before { + content: "\1f4ce"; +} +.glyphicon-camera:before { + content: "\1f4f7"; +} +.glyphicon-lock:before { + content: "\1f512"; +} +.glyphicon-bell:before { + content: "\1f514"; +} +.glyphicon-bookmark:before { + content: "\1f516"; +} +.glyphicon-fire:before { + content: "\1f525"; +} +.glyphicon-wrench:before { + content: "\1f527"; +} +.caret { + display: inline-block; + width: 0; + height: 0; + margin-left: 2px; + vertical-align: middle; + border-top: 4px solid #000; + border-right: 4px solid transparent; + border-left: 4px solid transparent; + border-bottom: 0 dotted; + content: ""; +} +.dropdown { + position: relative; +} +.dropdown-toggle:focus { + outline: 0; +} +.dropdown-menu { + position: absolute; + top: 100%; + left: 0; + z-index: 1005; + display: none; + float: left; + min-width: 160px; + padding: 5px 0; + margin: 2px 0 0; + list-style: none; + font-size: 13px; + background-color: #fff; + border: 1px solid #ccc; + border: 1px solid rgba(0,0,0,0.15); + border-radius: 4px; + -webkit-box-shadow: 0 6px 12px rgba(0,0,0,0.175); + box-shadow: 0 6px 12px rgba(0,0,0,0.175); + background-clip: padding-box; +} +.dropdown-menu.pull-right { + right: 0; + left: auto; +} +.dropdown-menu .divider { + height: 1px; + margin: 8px 0; + overflow: hidden; + background-color: #e5e5e5; +} +.dropdown-menu > li > a { + display: block; + padding: 3px 20px; + clear: both; + font-weight: normal; + line-height: 1.428571429; + color: #333333; + white-space: nowrap; +} +.dropdown-menu > li > a:hover, +.dropdown-menu > li > a:focus { + text-decoration: none; + color: #fff; + background-color: #f39922; +} +.dropdown-menu > .active > a, +.dropdown-menu > .active > a:hover, +.dropdown-menu > .active > a:focus { + color: #fff; + text-decoration: none; + outline: 0; + background-color: #f39922; +} +.dropdown-menu > .disabled > a, +.dropdown-menu > .disabled > a:hover, +.dropdown-menu > .disabled > a:focus { + color: #999999; +} +.dropdown-menu > .disabled > a:hover, +.dropdown-menu > .disabled > a:focus { + text-decoration: none; + background-color: transparent; + background-image: none; + filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); + cursor: not-allowed; +} +.open > .dropdown-menu { + display: block; +} +.open > a { + outline: 0; +} +.dropdown-header { + display: block; + padding: 3px 20px; + font-size: 12px; + line-height: 1.428571429; + color: #999999; +} +.dropdown-backdrop { + position: fixed; + left: 0; + right: 0; + bottom: 0; + top: 0; + z-index: 995; +} +.pull-right > .dropdown-menu { + right: 0; + left: auto; +} +.dropup .caret, +.navbar-fixed-bottom .dropdown .caret { + border-top: 0 dotted; + border-bottom: 4px solid #000; + content: ""; +} +.dropup .dropdown-menu, +.navbar-fixed-bottom .dropdown .dropdown-menu { + top: auto; + bottom: 100%; + margin-bottom: 1px; +} +.btn-default .caret { + border-top-color: #333; +} +.btn-primary .caret, +.btn-success .caret, +.btn-warning .caret, +.btn-danger .caret, +.btn-info .caret { + border-top-color: #fff; +} +.dropup .btn-default .caret { + border-bottom-color: #333; +} +.dropup .btn-primary .caret, +.dropup .btn-success .caret, +.dropup .btn-warning .caret, +.dropup .btn-danger .caret, +.dropup .btn-info .caret { + border-bottom-color: #fff; +} +.btn-group, +.btn-group-vertical { + position: relative; + display: inline-block; + vertical-align: middle; +} +.btn-group > .btn, +.btn-group-vertical > .btn { + position: relative; + float: left; +} +.btn-group > .btn:hover, +.btn-group > .btn:focus, +.btn-group > .btn:active, +.btn-group > .btn.active, +.btn-group-vertical > .btn:hover, +.btn-group-vertical > .btn:focus, +.btn-group-vertical > .btn:active, +.btn-group-vertical > .btn.active { + z-index: 2; +} +.btn-group > .btn:focus, +.btn-group-vertical > .btn:focus { + outline: none; +} +.btn-group .btn + .btn, +.btn-group .btn + .btn-group, +.btn-group .btn-group + .btn, +.btn-group .btn-group + .btn-group { + margin-left: -1px; +} +.btn-toolbar:before, +.btn-toolbar:after { + content: " "; + display: table; +} +.btn-toolbar:after { + clear: both; +} +.btn-toolbar:before, +.btn-toolbar:after { + content: " "; + display: table; +} +.btn-toolbar:after { + clear: both; +} +.btn-toolbar .btn-group { + float: left; +} +.btn-toolbar > .btn + .btn, +.btn-toolbar > .btn + .btn-group, +.btn-toolbar > .btn-group + .btn, +.btn-toolbar > .btn-group + .btn-group { + margin-left: 5px; +} +.btn-group > .btn:not(:first-child):not(:last-child):not(.dropdown-toggle) { + border-radius: 0; +} +.btn-group > .btn:first-child { + margin-left: 0; +} +.btn-group > .btn:first-child:not(:last-child):not(.dropdown-toggle) { + border-bottom-right-radius: 0; + border-top-right-radius: 0; +} +.btn-group > .btn:last-child:not(:first-child), +.btn-group > .dropdown-toggle:not(:first-child) { + border-bottom-left-radius: 0; + border-top-left-radius: 0; +} +.btn-group > .btn-group { + float: left; +} +.btn-group > .btn-group:not(:first-child):not(:last-child) > .btn { + border-radius: 0; +} +.btn-group > .btn-group:first-child > .btn:last-child, +.btn-group > .btn-group:first-child > .dropdown-toggle { + border-bottom-right-radius: 0; + border-top-right-radius: 0; +} +.btn-group > .btn-group:last-child > .btn:first-child { + border-bottom-left-radius: 0; + border-top-left-radius: 0; +} +.btn-group .dropdown-toggle:active, +.btn-group.open .dropdown-toggle { + outline: 0; +} +.btn-group-xs > .btn { + padding: 5px 10px; + font-size: 12px; + line-height: 1.5; + border-radius: 3px; + padding: 1px 5px; +} +.btn-group-sm > .btn { + padding: 5px 10px; + font-size: 12px; + line-height: 1.5; + border-radius: 3px; +} +.btn-group-lg > .btn { + padding: 10px 16px; + font-size: 17px; + line-height: 1.33; + border-radius: 6px; +} +.btn-group > .btn + .dropdown-toggle { + padding-left: 8px; + padding-right: 8px; +} +.btn-group > .btn-lg + .dropdown-toggle { + padding-left: 12px; + padding-right: 12px; +} +.btn-group.open .dropdown-toggle { + -webkit-box-shadow: inset 0 3px 5px rgba(0,0,0,0.125); + box-shadow: inset 0 3px 5px rgba(0,0,0,0.125); +} +.btn .caret { + margin-left: 0; +} +.btn-lg .caret { + border-width: 5px 5px 0; + border-bottom-width: 0; +} +.dropup .btn-lg .caret { + border-width: 0 5px 5px; +} +.btn-group-vertical > .btn, +.btn-group-vertical > .btn-group { + display: block; + float: none; + width: 100%; + max-width: 100%; +} +.btn-group-vertical > .btn-group:before, +.btn-group-vertical > .btn-group:after { + content: " "; + display: table; +} +.btn-group-vertical > .btn-group:after { + clear: both; +} +.btn-group-vertical > .btn-group:before, +.btn-group-vertical > .btn-group:after { + content: " "; + display: table; +} +.btn-group-vertical > .btn-group:after { + clear: both; +} +.btn-group-vertical > .btn-group > .btn { + float: none; +} +.btn-group-vertical > .btn + .btn, +.btn-group-vertical > .btn + .btn-group, +.btn-group-vertical > .btn-group + .btn, +.btn-group-vertical > .btn-group + .btn-group { + margin-top: -1px; + margin-left: 0; +} +.btn-group-vertical > .btn:not(:first-child):not(:last-child) { + border-radius: 0; +} +.btn-group-vertical > .btn:first-child:not(:last-child) { + border-top-right-radius: 4px; + border-bottom-right-radius: 0; + border-bottom-left-radius: 0; +} +.btn-group-vertical > .btn:last-child:not(:first-child) { + border-bottom-left-radius: 4px; + border-top-right-radius: 0; + border-top-left-radius: 0; +} +.btn-group-vertical > .btn-group:not(:first-child):not(:last-child) > .btn { + border-radius: 0; +} +.btn-group-vertical > .btn-group:first-child > .btn:last-child, +.btn-group-vertical > .btn-group:first-child > .dropdown-toggle { + border-bottom-right-radius: 0; + border-bottom-left-radius: 0; +} +.btn-group-vertical > .btn-group:last-child > .btn:first-child { + border-top-right-radius: 0; + border-top-left-radius: 0; +} +.btn-group-justified { + display: table; + width: 100%; + table-layout: fixed; + border-collapse: separate; +} +.btn-group-justified .btn { + float: none; + display: table-cell; + width: 1%; +} +[data-toggle="buttons"] > .btn > input[type="radio"], +[data-toggle="buttons"] > .btn > input[type="checkbox"] { + display: none; +} +.input-group { + position: relative; + display: table; + border-collapse: separate; +} +.input-group.col { + float: none; + padding-left: 0; + padding-right: 0; +} +.input-group .form-control { + width: 100%; + margin-bottom: 0; +} +.input-group-lg > .form-control, +.input-group-lg > .input-group-addon, +.input-group-lg > .input-group-btn > .btn { + height: 44px; + padding: 10px 16px; + font-size: 17px; + line-height: 1.33; + border-radius: 6px; +} +select.input-group-lg > .form-control, +select.input-group-lg > .input-group-addon, +select.input-group-lg > .input-group-btn > .btn { + height: 44px; + line-height: 44px; +} +textarea.input-group-lg > .form-control, +textarea.input-group-lg > .input-group-addon, +textarea.input-group-lg > .input-group-btn > .btn { + height: auto; +} +.input-group-sm > .form-control, +.input-group-sm > .input-group-addon, +.input-group-sm > .input-group-btn > .btn { + height: 30px; + padding: 5px 10px; + font-size: 12px; + line-height: 1.5; + border-radius: 3px; +} +select.input-group-sm > .form-control, +select.input-group-sm > .input-group-addon, +select.input-group-sm > .input-group-btn > .btn { + height: 30px; + line-height: 30px; +} +textarea.input-group-sm > .form-control, +textarea.input-group-sm > .input-group-addon, +textarea.input-group-sm > .input-group-btn > .btn { + height: auto; +} +.input-group-addon, +.input-group-btn, +.input-group .form-control { + display: table-cell; +} +.input-group-addon:not(:first-child):not(:last-child), +.input-group-btn:not(:first-child):not(:last-child), +.input-group .form-control:not(:first-child):not(:last-child) { + border-radius: 0; +} +.input-group-addon, +.input-group-btn { + width: 1%; + white-space: nowrap; + vertical-align: middle; +} +.input-group-addon { + padding: 6px 12px; + font-size: 13px; + font-weight: normal; + line-height: 1; + text-align: center; + background-color: #eeeeee; + border: 1px solid #ccc; + border-radius: 4px; +} +.input-group-addon.input-sm { + padding: 5px 10px; + font-size: 12px; + border-radius: 3px; +} +.input-group-addon.input-lg { + padding: 10px 16px; + font-size: 17px; + border-radius: 6px; +} +.input-group-addon input[type="radio"], +.input-group-addon input[type="checkbox"] { + margin-top: 0; +} +.input-group .form-control:first-child, +.input-group-addon:first-child, +.input-group-btn:first-child > .btn, +.input-group-btn:first-child > .dropdown-toggle, +.input-group-btn:last-child > .btn:not(:last-child):not(.dropdown-toggle) { + border-bottom-right-radius: 0; + border-top-right-radius: 0; +} +.input-group-addon:first-child { + border-right: 0; +} +.input-group .form-control:last-child, +.input-group-addon:last-child, +.input-group-btn:last-child > .btn, +.input-group-btn:last-child > .dropdown-toggle, +.input-group-btn:first-child > .btn:not(:first-child) { + border-bottom-left-radius: 0; + border-top-left-radius: 0; +} +.input-group-addon:last-child { + border-left: 0; +} +.input-group-btn { + position: relative; + white-space: nowrap; +} +.input-group-btn > .btn { + position: relative; +} +.input-group-btn > .btn + .btn { + margin-left: -4px; +} +.input-group-btn > .btn:hover, +.input-group-btn > .btn:active { + z-index: 2; +} +.nav { + margin-bottom: 0; + padding-left: 0; + list-style: none; +} +.nav:before, +.nav:after { + content: " "; + display: table; +} +.nav:after { + clear: both; +} +.nav:before, +.nav:after { + content: " "; + display: table; +} +.nav:after { + clear: both; +} +.nav > li { + position: relative; + display: block; +} +.nav > li > a { + position: relative; + display: block; + padding: 10px 15px; +} +.nav > li > a:hover, +.nav > li > a:focus { + text-decoration: none; + background-color: #eeeeee; +} +.nav > li.disabled > a { + color: #999999; +} +.nav > li.disabled > a:hover, +.nav > li.disabled > a:focus { + color: #999999; + text-decoration: none; + background-color: transparent; + cursor: not-allowed; +} +.nav .open > a, +.nav .open > a:hover, +.nav .open > a:focus { + background-color: #eeeeee; + border-color: #e9720f; +} +.nav .nav-divider { + height: 1px; + margin: 8px 0; + overflow: hidden; + background-color: #e5e5e5; +} +.nav > li > a > img { + max-width: none; +} +.nav-tabs { + border-bottom: 1px solid #ddd; +} +.nav-tabs > li { + float: left; + margin-bottom: -1px; +} +.nav-tabs > li > a { + margin-right: 2px; + line-height: 1.428571429; + border: 1px solid transparent; + border-radius: 4px 4px 0 0; +} +.nav-tabs > li > a:hover { + border-color: #eeeeee #eeeeee #ddd; +} +.nav-tabs > li.active > a, +.nav-tabs > li.active > a:hover, +.nav-tabs > li.active > a:focus { + color: #555555; + background-color: #fff; + border: 1px solid #ddd; + border-bottom-color: transparent; + cursor: default; +} +.nav-tabs.nav-justified { + width: 100%; + border-bottom: 0; +} +.nav-tabs.nav-justified > li { + float: none; +} +.nav-tabs.nav-justified > li > a { + text-align: center; +} +@media (min-width: 768px) { + .nav-tabs.nav-justified > li { + display: table-cell; + width: 1%; + } +} +.nav-tabs.nav-justified > li > a { + border-bottom: 1px solid #ddd; + margin-right: 0; +} +.nav-tabs.nav-justified > .active > a { + border-bottom-color: #fff; +} +.nav-pills > li { + float: left; +} +.nav-pills > li > a { + border-radius: 5px; +} +.nav-pills > li + li { + margin-left: 2px; +} +.nav-pills > li.active > a, +.nav-pills > li.active > a:hover, +.nav-pills > li.active > a:focus { + color: #fff; + background-color: #f39922; +} +.nav-stacked > li { + float: none; +} +.nav-stacked > li + li { + margin-top: 2px; + margin-left: 0; +} +.nav-justified { + width: 100%; +} +.nav-justified > li { + float: none; +} +.nav-justified > li > a { + text-align: center; +} +@media (min-width: 768px) { + .nav-justified > li { + display: table-cell; + width: 1%; + } +} +.nav-tabs-justified { + border-bottom: 0; +} +.nav-tabs-justified > li > a { + border-bottom: 1px solid #ddd; + margin-right: 0; +} +.nav-tabs-justified > .active > a { + border-bottom-color: #fff; +} +.tabbable:before, +.tabbable:after { + content: " "; + display: table; +} +.tabbable:after { + clear: both; +} +.tabbable:before, +.tabbable:after { + content: " "; + display: table; +} +.tabbable:after { + clear: both; +} +.tab-content > .tab-pane, +.pill-content > .pill-pane { + display: none; +} +.tab-content > .active, +.pill-content > .active { + display: block; +} +.nav .caret { + border-top-color: #e9720f; + border-bottom-color: #e9720f; +} +.nav a:hover .caret { + border-top-color: #a14f0a; + border-bottom-color: #a14f0a; +} +.nav-tabs .dropdown-menu { + margin-top: -1px; + border-top-right-radius: 0; + border-top-left-radius: 0; +} +.navbar { + position: relative; + z-index: 1000; + min-height: 50px; + margin-bottom: 18px; + border: 1px solid transparent; +} +.navbar:before, +.navbar:after { + content: " "; + display: table; +} +.navbar:after { + clear: both; +} +.navbar:before, +.navbar:after { + content: " "; + display: table; +} +.navbar:after { + clear: both; +} +@media (min-width: 768px) { + .navbar { + border-radius: 4px; + } +} +.navbar-header:before, +.navbar-header:after { + content: " "; + display: table; +} +.navbar-header:after { + clear: both; +} +.navbar-header:before, +.navbar-header:after { + content: " "; + display: table; +} +.navbar-header:after { + clear: both; +} +@media (min-width: 768px) { + .navbar-header { + float: left; + } +} +.navbar-collapse { + max-height: 340px; + overflow-x: visible; + padding-right: 15px; + padding-left: 15px; + border-top: 1px solid transparent; + box-shadow: inset 0 1px 0 rgba(255,255,255,0.1); + -webkit-overflow-scrolling: touch; +} +.navbar-collapse:before, +.navbar-collapse:after { + content: " "; + display: table; +} +.navbar-collapse:after { + clear: both; +} +.navbar-collapse:before, +.navbar-collapse:after { + content: " "; + display: table; +} +.navbar-collapse:after { + clear: both; +} +.navbar-collapse.in { + overflow-y: auto; +} +@media (min-width: 768px) { + .navbar-collapse { + width: auto; + border-top: 0; + box-shadow: none; + } + .navbar-collapse.collapse { + display: block !important; + height: auto !important; + padding-bottom: 0; + overflow: visible !important; + } + .navbar-collapse.in { + overflow-y: visible; + } + .navbar-collapse .navbar-nav.navbar-left:first-child { + margin-left: -15px; + } + .navbar-collapse .navbar-nav.navbar-right:last-child { + margin-right: -15px; + } + .navbar-collapse .navbar-text:last-child { + margin-right: 0; + } +} +.container > .navbar-header, +.container > .navbar-collapse { + margin-right: -15px; + margin-left: -15px; +} +@media (min-width: 768px) { + .container > .navbar-header, + .container > .navbar-collapse { + margin-right: 0; + margin-left: 0; + } +} +.navbar-static-top { + border-width: 0 0 1px; +} +@media (min-width: 768px) { + .navbar-static-top { + border-radius: 0; + } +} +.navbar-fixed-top, +.navbar-fixed-bottom { + position: fixed; + right: 0; + left: 0; + border-width: 0 0 1px; +} +@media (min-width: 768px) { + .navbar-fixed-top, + .navbar-fixed-bottom { + border-radius: 0; + } +} +.navbar-fixed-top { + z-index: 1030; + top: 0; +} +.navbar-fixed-bottom { + bottom: 0; + margin-bottom: 0; +} +.navbar-brand { + float: left; + padding: 16px 15px; + font-size: 17px; + line-height: 18px; +} +.navbar-brand:hover, +.navbar-brand:focus { + text-decoration: none; +} +@media (min-width: 768px) { + .navbar > .container .navbar-brand { + margin-left: -15px; + } +} +.navbar-toggle { + position: relative; + float: right; + margin-right: 15px; + padding: 9px 10px; + margin-top: 8px; + margin-bottom: 8px; + background-color: transparent; + border: 1px solid transparent; + border-radius: 4px; +} +.navbar-toggle .icon-bar { + display: block; + width: 22px; + height: 2px; + border-radius: 1px; +} +.navbar-toggle .icon-bar + .icon-bar { + margin-top: 4px; +} +@media (min-width: 768px) { + .navbar-toggle { + display: none; + } +} +.navbar-nav { + margin: 8px -15px; +} +.navbar-nav > li > a { + padding-top: 10px; + padding-bottom: 10px; + line-height: 18px; +} +@media (max-width: 767px) { + .navbar-nav .open .dropdown-menu { + position: static; + float: none; + width: auto; + margin-top: 0; + background-color: transparent; + border: 0; + box-shadow: none; + } + .navbar-nav .open .dropdown-menu > li > a, + .navbar-nav .open .dropdown-menu .dropdown-header { + padding: 5px 15px 5px 25px; + } + .navbar-nav .open .dropdown-menu > li > a { + line-height: 18px; + } + .navbar-nav .open .dropdown-menu > li > a:hover, + .navbar-nav .open .dropdown-menu > li > a:focus { + background-image: none; + } +} +@media (min-width: 768px) { + .navbar-nav { + float: left; + margin: 0; + } + .navbar-nav > li { + float: left; + } + .navbar-nav > li > a { + padding-top: 16px; + padding-bottom: 16px; + } +} +@media (min-width: 768px) { + .navbar-left { + float: left !important; + } + .navbar-right { + float: right !important; + } +} +.navbar-form { + margin-left: -15px; + margin-right: -15px; + padding: 10px 15px; + border-top: 1px solid transparent; + border-bottom: 1px solid transparent; + -webkit-box-shadow: inset 0 1px 0 rgba(255,255,255,0.1), 0 1px 0 rgba(255,255,255,0.1); + box-shadow: inset 0 1px 0 rgba(255,255,255,0.1), 0 1px 0 rgba(255,255,255,0.1); + margin-top: 9px; + margin-bottom: 9px; +} +@media (min-width: 768px) { + .navbar-form .form-group { + display: inline-block; + margin-bottom: 0; + vertical-align: middle; + } + .navbar-form .form-control { + display: inline-block; + } + .navbar-form .radio, + .navbar-form .checkbox { + display: inline-block; + margin-top: 0; + margin-bottom: 0; + padding-left: 0; + } + .navbar-form .radio input[type="radio"], + .navbar-form .checkbox input[type="checkbox"] { + float: none; + margin-left: 0; + } +} +@media (max-width: 767px) { + .navbar-form .form-group { + margin-bottom: 5px; + } +} +@media (min-width: 768px) { + .navbar-form { + width: auto; + border: 0; + margin-left: 0; + margin-right: 0; + padding-top: 0; + padding-bottom: 0; + -webkit-box-shadow: none; + box-shadow: none; + } +} +.navbar-nav > li > .dropdown-menu { + margin-top: 0; + border-top-right-radius: 0; + border-top-left-radius: 0; +} +.navbar-fixed-bottom .navbar-nav > li > .dropdown-menu { + border-bottom-right-radius: 0; + border-bottom-left-radius: 0; +} +.navbar-nav.pull-right > li > .dropdown-menu, +.navbar-nav > li > .dropdown-menu.pull-right { + left: auto; + right: 0; +} +.navbar-btn { + margin-top: 9px; + margin-bottom: 9px; +} +.navbar-text { + float: left; + margin-top: 16px; + margin-bottom: 16px; +} +@media (min-width: 768px) { + .navbar-text { + margin-left: 15px; + margin-right: 15px; + } +} +.navbar-default { + background-color: #f8f8f8; + border-color: #e7e7e7; +} +.navbar-default .navbar-brand { + color: #777; +} +.navbar-default .navbar-brand:hover, +.navbar-default .navbar-brand:focus { + color: #5e5e5e; + background-color: transparent; +} +.navbar-default .navbar-text { + color: #777; +} +.navbar-default .navbar-nav > li > a { + color: #777; +} +.navbar-default .navbar-nav > li > a:hover, +.navbar-default .navbar-nav > li > a:focus { + color: #333; + background-color: transparent; +} +.navbar-default .navbar-nav > .active > a, +.navbar-default .navbar-nav > .active > a:hover, +.navbar-default .navbar-nav > .active > a:focus { + color: #555; + background-color: #e7e7e7; +} +.navbar-default .navbar-nav > .disabled > a, +.navbar-default .navbar-nav > .disabled > a:hover, +.navbar-default .navbar-nav > .disabled > a:focus { + color: #ccc; + background-color: transparent; +} +.navbar-default .navbar-toggle { + border-color: #ddd; +} +.navbar-default .navbar-toggle:hover, +.navbar-default .navbar-toggle:focus { + background-color: #ddd; +} +.navbar-default .navbar-toggle .icon-bar { + background-color: #ccc; +} +.navbar-default .navbar-collapse, +.navbar-default .navbar-form { + border-color: #e6e6e6; +} +.navbar-default .navbar-nav > .dropdown > a:hover .caret, +.navbar-default .navbar-nav > .dropdown > a:focus .caret { + border-top-color: #333; + border-bottom-color: #333; +} +.navbar-default .navbar-nav > .open > a, +.navbar-default .navbar-nav > .open > a:hover, +.navbar-default .navbar-nav > .open > a:focus { + background-color: #e7e7e7; + color: #555; +} +.navbar-default .navbar-nav > .open > a .caret, +.navbar-default .navbar-nav > .open > a:hover .caret, +.navbar-default .navbar-nav > .open > a:focus .caret { + border-top-color: #555; + border-bottom-color: #555; +} +.navbar-default .navbar-nav > .dropdown > a .caret { + border-top-color: #777; + border-bottom-color: #777; +} +@media (max-width: 767px) { + .navbar-default .navbar-nav .open .dropdown-menu > li > a { + color: #777; + } + .navbar-default .navbar-nav .open .dropdown-menu > li > a:hover, + .navbar-default .navbar-nav .open .dropdown-menu > li > a:focus { + color: #333; + background-color: transparent; + } + .navbar-default .navbar-nav .open .dropdown-menu > .active > a, + .navbar-default .navbar-nav .open .dropdown-menu > .active > a:hover, + .navbar-default .navbar-nav .open .dropdown-menu > .active > a:focus { + color: #555; + background-color: #e7e7e7; + } + .navbar-default .navbar-nav .open .dropdown-menu > .disabled > a, + .navbar-default .navbar-nav .open .dropdown-menu > .disabled > a:hover, + .navbar-default .navbar-nav .open .dropdown-menu > .disabled > a:focus { + color: #ccc; + background-color: transparent; + } +} +.navbar-default .navbar-link { + color: #777; +} +.navbar-default .navbar-link:hover { + color: #333; +} +.navbar-inverse { + background-color: #222; + border-color: #090909; +} +.navbar-inverse .navbar-brand { + color: #999999; +} +.navbar-inverse .navbar-brand:hover, +.navbar-inverse .navbar-brand:focus { + color: #fff; + background-color: transparent; +} +.navbar-inverse .navbar-text { + color: #999999; +} +.navbar-inverse .navbar-nav > li > a { + color: #999999; +} +.navbar-inverse .navbar-nav > li > a:hover, +.navbar-inverse .navbar-nav > li > a:focus { + color: #fff; + background-color: transparent; +} +.navbar-inverse .navbar-nav > .active > a, +.navbar-inverse .navbar-nav > .active > a:hover, +.navbar-inverse .navbar-nav > .active > a:focus { + color: #fff; + background-color: #090909; +} +.navbar-inverse .navbar-nav > .disabled > a, +.navbar-inverse .navbar-nav > .disabled > a:hover, +.navbar-inverse .navbar-nav > .disabled > a:focus { + color: #444; + background-color: transparent; +} +.navbar-inverse .navbar-toggle { + border-color: #333; +} +.navbar-inverse .navbar-toggle:hover, +.navbar-inverse .navbar-toggle:focus { + background-color: #333; +} +.navbar-inverse .navbar-toggle .icon-bar { + background-color: #fff; +} +.navbar-inverse .navbar-collapse, +.navbar-inverse .navbar-form { + border-color: #101010; +} +.navbar-inverse .navbar-nav > .open > a, +.navbar-inverse .navbar-nav > .open > a:hover, +.navbar-inverse .navbar-nav > .open > a:focus { + background-color: #090909; + color: #fff; +} +.navbar-inverse .navbar-nav > .dropdown > a:hover .caret { + border-top-color: #fff; + border-bottom-color: #fff; +} +.navbar-inverse .navbar-nav > .dropdown > a .caret { + border-top-color: #999999; + border-bottom-color: #999999; +} +.navbar-inverse .navbar-nav > .open > a .caret, +.navbar-inverse .navbar-nav > .open > a:hover .caret, +.navbar-inverse .navbar-nav > .open > a:focus .caret { + border-top-color: #fff; + border-bottom-color: #fff; +} +@media (max-width: 767px) { + .navbar-inverse .navbar-nav .open .dropdown-menu > .dropdown-header { + border-color: #090909; + } + .navbar-inverse .navbar-nav .open .dropdown-menu > li > a { + color: #999999; + } + .navbar-inverse .navbar-nav .open .dropdown-menu > li > a:hover, + .navbar-inverse .navbar-nav .open .dropdown-menu > li > a:focus { + color: #fff; + background-color: transparent; + } + .navbar-inverse .navbar-nav .open .dropdown-menu > .active > a, + .navbar-inverse .navbar-nav .open .dropdown-menu > .active > a:hover, + .navbar-inverse .navbar-nav .open .dropdown-menu > .active > a:focus { + color: #fff; + background-color: #090909; + } + .navbar-inverse .navbar-nav .open .dropdown-menu > .disabled > a, + .navbar-inverse .navbar-nav .open .dropdown-menu > .disabled > a:hover, + .navbar-inverse .navbar-nav .open .dropdown-menu > .disabled > a:focus { + color: #444; + background-color: transparent; + } +} +.navbar-inverse .navbar-link { + color: #999999; +} +.navbar-inverse .navbar-link:hover { + color: #fff; +} +.breadcrumb { + padding: 8px 15px; + margin-bottom: 18px; + list-style: none; + background-color: #f5f5f5; + border-radius: 4px; +} +.breadcrumb > li { + display: inline-block; +} +.breadcrumb > li+li:before { + content: "/\00a0"; + padding: 0 5px; + color: #333; +} +.breadcrumb > .active { + color: #999999; +} +.pagination { + display: inline-block; + padding-left: 0; + margin: 18px 0; + border-radius: 4px; +} +.pagination > li { + display: inline; +} +.pagination > li > a, +.pagination > li > span { + position: relative; + float: left; + padding: 6px 12px; + line-height: 1.428571429; + text-decoration: none; + background-color: #fff; + border: 1px solid #ddd; + margin-left: -1px; +} +.pagination > li:first-child > a, +.pagination > li:first-child > span { + margin-left: 0; + border-bottom-left-radius: 4px; + border-top-left-radius: 4px; +} +.pagination > li:last-child > a, +.pagination > li:last-child > span { + border-bottom-right-radius: 4px; + border-top-right-radius: 4px; +} +.pagination > li > a:hover, +.pagination > li > a:focus, +.pagination > li > span:hover, +.pagination > li > span:focus { + background-color: #eeeeee; +} +.pagination > .active > a, +.pagination > .active > a:hover, +.pagination > .active > a:focus, +.pagination > .active > span, +.pagination > .active > span:hover, +.pagination > .active > span:focus { + z-index: 2; + color: #fff; + background-color: #f39922; + border-color: #f39922; + cursor: default; +} +.pagination > .disabled > span, +.pagination > .disabled > a, +.pagination > .disabled > a:hover, +.pagination > .disabled > a:focus { + color: #999999; + background-color: #fff; + border-color: #ddd; + cursor: not-allowed; +} +.pagination-lg > li > a, +.pagination-lg > li > span { + padding: 10px 16px; + font-size: 17px; +} +.pagination-lg > li:first-child > a, +.pagination-lg > li:first-child > span { + border-bottom-left-radius: 6px; + border-top-left-radius: 6px; +} +.pagination-lg > li:last-child > a, +.pagination-lg > li:last-child > span { + border-bottom-right-radius: 6px; + border-top-right-radius: 6px; +} +.pagination-sm > li > a, +.pagination-sm > li > span { + padding: 5px 10px; + font-size: 12px; +} +.pagination-sm > li:first-child > a, +.pagination-sm > li:first-child > span { + border-bottom-left-radius: 3px; + border-top-left-radius: 3px; +} +.pagination-sm > li:last-child > a, +.pagination-sm > li:last-child > span { + border-bottom-right-radius: 3px; + border-top-right-radius: 3px; +} +.pager { + padding-left: 0; + margin: 18px 0; + list-style: none; + text-align: center; +} +.pager:before, +.pager:after { + content: " "; + display: table; +} +.pager:after { + clear: both; +} +.pager:before, +.pager:after { + content: " "; + display: table; +} +.pager:after { + clear: both; +} +.pager li { + display: inline; +} +.pager li > a, +.pager li > span { + display: inline-block; + padding: 5px 14px; + background-color: #fff; + border: 1px solid #ddd; + border-radius: 15px; +} +.pager li > a:hover, +.pager li > a:focus { + text-decoration: none; + background-color: #eeeeee; +} +.pager .next > a, +.pager .next > span { + float: right; +} +.pager .previous > a, +.pager .previous > span { + float: left; +} +.pager .disabled > a, +.pager .disabled > a:hover, +.pager .disabled > a:focus, +.pager .disabled > span { + color: #999999; + background-color: #fff; + cursor: not-allowed; +} +.label { + display: inline; + padding: .2em .6em .3em; + font-size: 75%; + font-weight: bold; + line-height: 1; + color: #fff; + text-align: center; + white-space: nowrap; + vertical-align: baseline; + border-radius: .25em; +} +.label[href]:hover, +.label[href]:focus { + color: #fff; + text-decoration: none; + cursor: pointer; +} +.label:empty { + display: none; +} +.label-default { + background-color: #999999; +} +.label-default[href]:hover, +.label-default[href]:focus { + background-color: #808080; +} +.label-primary { + background-color: #f39922; +} +.label-primary[href]:hover, +.label-primary[href]:focus { + background-color: #d67f0c; +} +.label-success { + background-color: #5cb85c; +} +.label-success[href]:hover, +.label-success[href]:focus { + background-color: #449d44; +} +.label-info { + background-color: #5bc0de; +} +.label-info[href]:hover, +.label-info[href]:focus { + background-color: #31b0d5; +} +.label-warning { + background-color: #f0ad4e; +} +.label-warning[href]:hover, +.label-warning[href]:focus { + background-color: #ec971f; +} +.label-danger { + background-color: #d9534f; +} +.label-danger[href]:hover, +.label-danger[href]:focus { + background-color: #c9302c; +} +.badge { + display: inline-block; + min-width: 10px; + padding: 3px 7px; + font-size: 12px; + font-weight: bold; + color: #fff; + line-height: 1; + vertical-align: baseline; + white-space: nowrap; + text-align: center; + background-color: #999999; + border-radius: 10px; +} +.badge:empty { + display: none; +} +a.badge:hover, +a.badge:focus { + color: #fff; + text-decoration: none; + cursor: pointer; +} +.btn .badge { + position: relative; + top: -1px; +} +a.list-group-item.active > .badge, +.nav-pills > .active > a > .badge { + color: #e9720f; + background-color: #fff; +} +.nav-pills > li > a > .badge { + margin-left: 3px; +} +.jumbotron { + padding: 30px; + margin-bottom: 30px; + font-size: 19.5px; + font-weight: 200; + line-height: 2.1428571435; + color: inherit; + background-color: #eeeeee; +} +.jumbotron h1 { + line-height: 1; + color: inherit; +} +.jumbotron p { + line-height: 1.4; +} +.container .jumbotron { + border-radius: 6px; +} +@media screen and (min-width: 768px) { + .jumbotron { + padding-top: 48px; + padding-bottom: 48px; + } + .container .jumbotron { + padding-left: 60px; + padding-right: 60px; + } + .jumbotron h1 { + font-size: 58.5px; + } +} +.thumbnail { + padding: 4px; + line-height: 1.428571429; + background-color: #fff; + border: 1px solid #ddd; + border-radius: 4px; + -webkit-transition: all .2s ease-in-out; + transition: all .2s ease-in-out; + display: inline-block; + max-width: 100%; + height: auto; + display: block; +} +.thumbnail > img { + display: block; + max-width: 100%; + height: auto; +} +a.thumbnail:hover, +a.thumbnail:focus { + border-color: #e9720f; +} +.thumbnail > img { + margin-left: auto; + margin-right: auto; +} +.thumbnail .caption { + padding: 9px; + color: #333333; +} +.alert { + padding: 15px; + margin-bottom: 18px; + border: 1px solid transparent; + border-radius: 4px; +} +.alert h4 { + margin-top: 0; + color: inherit; +} +.alert .alert-link { + font-weight: bold; +} +.alert > p, +.alert > ul { + margin-bottom: 0; +} +.alert > p + p { + margin-top: 5px; +} +.alert-dismissable { + padding-right: 35px; +} +.alert-dismissable .close { + position: relative; + top: -2px; + right: -21px; + color: inherit; +} +.alert-success { + background-color: #dff0d8; + border-color: #d6e9c6; + color: #468847; +} +.alert-success hr { + border-top-color: #c9e2b3; +} +.alert-success .alert-link { + color: #356635; +} +.alert-info { + background-color: #d9edf7; + border-color: #bce8f1; + color: #3a87ad; +} +.alert-info hr { + border-top-color: #a6e1ec; +} +.alert-info .alert-link { + color: #2d6987; +} +.alert-warning { + background-color: #fcf8e3; + border-color: #fbeed5; + color: #c09853; +} +.alert-warning hr { + border-top-color: #f8e5be; +} +.alert-warning .alert-link { + color: #a47e3c; +} +.alert-danger { + background-color: #f2dede; + border-color: #eed3d7; + color: #b94a48; +} +.alert-danger hr { + border-top-color: #e6c1c7; +} +.alert-danger .alert-link { + color: #953b39; +} +@-webkit-keyframes progress-bar-stripes { + from { + background-position: 40px 0; + } + to { + background-position: 0 0; + } +} +@-moz-keyframes progress-bar-stripes { + from { + background-position: 40px 0; + } + to { + background-position: 0 0; + } +} +@-o-keyframes progress-bar-stripes { + from { + background-position: 0 0; + } + to { + background-position: 40px 0; + } +} +@keyframes progress-bar-stripes { + from { + background-position: 40px 0; + } + to { + background-position: 0 0; + } +} +.progress { + overflow: hidden; + height: 18px; + margin-bottom: 18px; + background-color: #f5f5f5; + border-radius: 4px; + -webkit-box-shadow: inset 0 1px 2px rgba(0,0,0,0.1); + box-shadow: inset 0 1px 2px rgba(0,0,0,0.1); +} +.progress-bar { + float: left; + width: 0%; + height: 100%; + font-size: 12px; + color: #fff; + text-align: center; + background-color: #f39922; + -webkit-box-shadow: inset 0 -1px 0 rgba(0,0,0,0.15); + box-shadow: inset 0 -1px 0 rgba(0,0,0,0.15); + -webkit-transition: width .6s ease; + transition: width .6s ease; +} +.progress-striped .progress-bar { + background-image: -webkit-gradient(linear,0 100%,100% 0,color-stop(.25,rgba(255,255,255,0.15)),color-stop(.25,transparent),color-stop(.5,transparent),color-stop(.5,rgba(255,255,255,0.15)),color-stop(.75,rgba(255,255,255,0.15)),color-stop(.75,transparent),to(transparent)); + background-image: -webkit-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent); + background-image: -moz-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent); + background-image: linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent); + background-size: 40px 40px; +} +.progress.active .progress-bar { + -webkit-animation: progress-bar-stripes 2s linear infinite; + -moz-animation: progress-bar-stripes 2s linear infinite; + -ms-animation: progress-bar-stripes 2s linear infinite; + -o-animation: progress-bar-stripes 2s linear infinite; + animation: progress-bar-stripes 2s linear infinite; +} +.progress-bar-success { + background-color: #5cb85c; +} +.progress-striped .progress-bar-success { + background-image: -webkit-gradient(linear,0 100%,100% 0,color-stop(.25,rgba(255,255,255,0.15)),color-stop(.25,transparent),color-stop(.5,transparent),color-stop(.5,rgba(255,255,255,0.15)),color-stop(.75,rgba(255,255,255,0.15)),color-stop(.75,transparent),to(transparent)); + background-image: -webkit-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent); + background-image: -moz-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent); + background-image: linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent); +} +.progress-bar-info { + background-color: #5bc0de; +} +.progress-striped .progress-bar-info { + background-image: -webkit-gradient(linear,0 100%,100% 0,color-stop(.25,rgba(255,255,255,0.15)),color-stop(.25,transparent),color-stop(.5,transparent),color-stop(.5,rgba(255,255,255,0.15)),color-stop(.75,rgba(255,255,255,0.15)),color-stop(.75,transparent),to(transparent)); + background-image: -webkit-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent); + background-image: -moz-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent); + background-image: linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent); +} +.progress-bar-warning { + background-color: #f0ad4e; +} +.progress-striped .progress-bar-warning { + background-image: -webkit-gradient(linear,0 100%,100% 0,color-stop(.25,rgba(255,255,255,0.15)),color-stop(.25,transparent),color-stop(.5,transparent),color-stop(.5,rgba(255,255,255,0.15)),color-stop(.75,rgba(255,255,255,0.15)),color-stop(.75,transparent),to(transparent)); + background-image: -webkit-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent); + background-image: -moz-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent); + background-image: linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent); +} +.progress-bar-danger { + background-color: #d9534f; +} +.progress-striped .progress-bar-danger { + background-image: -webkit-gradient(linear,0 100%,100% 0,color-stop(.25,rgba(255,255,255,0.15)),color-stop(.25,transparent),color-stop(.5,transparent),color-stop(.5,rgba(255,255,255,0.15)),color-stop(.75,rgba(255,255,255,0.15)),color-stop(.75,transparent),to(transparent)); + background-image: -webkit-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent); + background-image: -moz-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent); + background-image: linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent); +} +.media, +.media-body { + overflow: hidden; + zoom: 1; +} +.media, +.media .media { + margin-top: 15px; +} +.media:first-child { + margin-top: 0; +} +.media-object { + display: block; +} +.media-heading { + margin: 0 0 5px; +} +.media > .pull-left { + margin-right: 10px; +} +.media > .pull-right { + margin-left: 10px; +} +.media-list { + padding-left: 0; + list-style: none; +} +.list-group { + margin-bottom: 20px; + padding-left: 0; +} +.list-group-item { + position: relative; + display: block; + padding: 10px 15px; + margin-bottom: -1px; + background-color: #fff; + border: 1px solid #ddd; +} +.list-group-item:first-child { + border-top-right-radius: 4px; + border-top-left-radius: 4px; +} +.list-group-item:last-child { + margin-bottom: 0; + border-bottom-right-radius: 4px; + border-bottom-left-radius: 4px; +} +.list-group-item > .badge { + float: right; +} +.list-group-item > .badge + .badge { + margin-right: 5px; +} +a.list-group-item { + color: #555; +} +a.list-group-item .list-group-item-heading { + color: #333; +} +a.list-group-item:hover, +a.list-group-item:focus { + text-decoration: none; + background-color: #f5f5f5; +} +.list-group-item.active, +.list-group-item.active:hover, +.list-group-item.active:focus { + z-index: 2; + color: #fff; + background-color: #f39922; + border-color: #f39922; +} +.list-group-item.active .list-group-item-heading, +.list-group-item.active:hover .list-group-item-heading, +.list-group-item.active:focus .list-group-item-heading { + color: inherit; +} +.list-group-item.active .list-group-item-text, +.list-group-item.active:hover .list-group-item-text, +.list-group-item.active:focus .list-group-item-text { + color: #fef2e3; +} +.list-group-item-heading { + margin-top: 0; + margin-bottom: 5px; +} +.list-group-item-text { + margin-bottom: 0; + line-height: 1.3; +} +.panel { + margin-bottom: 18px; + background-color: #fff; + border: 1px solid transparent; + border-radius: 4px; + -webkit-box-shadow: 0 1px 1px rgba(0,0,0,0.05); + box-shadow: 0 1px 1px rgba(0,0,0,0.05); +} +.panel-body { + padding: 15px; +} +.panel-body:before, +.panel-body:after { + content: " "; + display: table; +} +.panel-body:after { + clear: both; +} +.panel-body:before, +.panel-body:after { + content: " "; + display: table; +} +.panel-body:after { + clear: both; +} +.panel > .list-group { + margin-bottom: 0; +} +.panel > .list-group .list-group-item { + border-width: 1px 0; +} +.panel > .list-group .list-group-item:first-child { + border-top-right-radius: 0; + border-top-left-radius: 0; +} +.panel > .list-group .list-group-item:last-child { + border-bottom: 0; +} +.panel-heading + .list-group .list-group-item:first-child { + border-top-width: 0; +} +.panel > .table { + margin-bottom: 0; +} +.panel > .panel-body + .table { + border-top: 1px solid #ddd; +} +.panel-heading { + padding: 10px 15px; + border-bottom: 1px solid transparent; + border-top-right-radius: 3px; + border-top-left-radius: 3px; +} +.panel-title { + margin-top: 0; + margin-bottom: 0; + font-size: 15px; +} +.panel-title > a { + color: inherit; +} +.panel-footer { + padding: 10px 15px; + background-color: #f5f5f5; + border-top: 1px solid #ddd; + border-bottom-right-radius: 3px; + border-bottom-left-radius: 3px; +} +.panel-group .panel { + margin-bottom: 0; + border-radius: 4px; + overflow: hidden; +} +.panel-group .panel + .panel { + margin-top: 5px; +} +.panel-group .panel-heading { + border-bottom: 0; +} +.panel-group .panel-heading + .panel-collapse .panel-body { + border-top: 1px solid #ddd; +} +.panel-group .panel-footer { + border-top: 0; +} +.panel-group .panel-footer + .panel-collapse .panel-body { + border-bottom: 1px solid #ddd; +} +.panel-default { + border-color: #ddd; +} +.panel-default > .panel-heading { + color: #333333; + background-color: #f5f5f5; + border-color: #ddd; +} +.panel-default > .panel-heading + .panel-collapse .panel-body { + border-top-color: #ddd; +} +.panel-default > .panel-footer + .panel-collapse .panel-body { + border-bottom-color: #ddd; +} +.panel-primary { + border-color: #f39922; +} +.panel-primary > .panel-heading { + color: #fff; + background-color: #f39922; + border-color: #f39922; +} +.panel-primary > .panel-heading + .panel-collapse .panel-body { + border-top-color: #f39922; +} +.panel-primary > .panel-footer + .panel-collapse .panel-body { + border-bottom-color: #f39922; +} +.panel-success { + border-color: #d6e9c6; +} +.panel-success > .panel-heading { + color: #468847; + background-color: #dff0d8; + border-color: #d6e9c6; +} +.panel-success > .panel-heading + .panel-collapse .panel-body { + border-top-color: #d6e9c6; +} +.panel-success > .panel-footer + .panel-collapse .panel-body { + border-bottom-color: #d6e9c6; +} +.panel-warning { + border-color: #fbeed5; +} +.panel-warning > .panel-heading { + color: #c09853; + background-color: #fcf8e3; + border-color: #fbeed5; +} +.panel-warning > .panel-heading + .panel-collapse .panel-body { + border-top-color: #fbeed5; +} +.panel-warning > .panel-footer + .panel-collapse .panel-body { + border-bottom-color: #fbeed5; +} +.panel-danger { + border-color: #eed3d7; +} +.panel-danger > .panel-heading { + color: #b94a48; + background-color: #f2dede; + border-color: #eed3d7; +} +.panel-danger > .panel-heading + .panel-collapse .panel-body { + border-top-color: #eed3d7; +} +.panel-danger > .panel-footer + .panel-collapse .panel-body { + border-bottom-color: #eed3d7; +} +.panel-info { + border-color: #bce8f1; +} +.panel-info > .panel-heading { + color: #3a87ad; + background-color: #d9edf7; + border-color: #bce8f1; +} +.panel-info > .panel-heading + .panel-collapse .panel-body { + border-top-color: #bce8f1; +} +.panel-info > .panel-footer + .panel-collapse .panel-body { + border-bottom-color: #bce8f1; +} +.well { + min-height: 20px; + padding: 19px; + margin-bottom: 20px; + background-color: #f5f5f5; + border: 1px solid #e3e3e3; + border-radius: 4px; + -webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,0.05); + box-shadow: inset 0 1px 1px rgba(0,0,0,0.05); +} +.well blockquote { + border-color: #ddd; + border-color: rgba(0,0,0,0.15); +} +.well-lg { + padding: 24px; + border-radius: 6px; +} +.well-sm { + padding: 9px; + border-radius: 3px; +} +.close { + float: right; + font-size: 19.5px; + font-weight: bold; + line-height: 1; + color: #000; + text-shadow: 0 1px 0 #fff; + opacity: .2; + filter: alpha(opacity=20); +} +.close:hover, +.close:focus { + color: #000; + text-decoration: none; + cursor: pointer; + opacity: .5; + filter: alpha(opacity=50); +} +button.close { + padding: 0; + cursor: pointer; + background: transparent; + border: 0; + -webkit-appearance: none; +} +.modal-open { + overflow: hidden; +} +body.modal-open, +.modal-open .navbar-fixed-top, +.modal-open .navbar-fixed-bottom { + margin-right: 15px; +} +.modal { + display: none; + overflow: auto; + overflow-y: scroll; + position: fixed; + top: 0; + right: 0; + bottom: 0; + left: 0; + z-index: 1040; +} +.modal.fade .modal-dialog { + -webkit-transform: translate(0,-25%); + -ms-transform: translate(0,-25%); + transform: translate(0,-25%); + -webkit-transition: -webkit-transform 0.3s ease-out; + -moz-transition: -moz-transform 0.3s ease-out; + -o-transition: -o-transform 0.3s ease-out; + transition: transform 0.3s ease-out; +} +.modal.in .modal-dialog { + -webkit-transform: translate(0,0); + -ms-transform: translate(0,0); + transform: translate(0,0); +} +.modal-dialog { + margin-left: auto; + margin-right: auto; + width: auto; + padding: 10px; + z-index: 1050; +} +.modal-content { + position: relative; + background-color: #fff; + border: 1px solid #999; + border: 1px solid rgba(0,0,0,0.2); + border-radius: 6px; + -webkit-box-shadow: 0 3px 9px rgba(0,0,0,0.5); + box-shadow: 0 3px 9px rgba(0,0,0,0.5); + background-clip: padding-box; + outline: none; +} +.modal-backdrop { + position: fixed; + top: 0; + right: 0; + bottom: 0; + left: 0; + z-index: 1030; + background-color: #000; +} +.modal-backdrop.fade { + opacity: 0; + filter: alpha(opacity=0); +} +.modal-backdrop.in { + opacity: .5; + filter: alpha(opacity=50); +} +.modal-header { + padding: 15px; + border-bottom: 1px solid #e5e5e5; + min-height: 16.428571429px; +} +.modal-header .close { + margin-top: -2px; +} +.modal-title { + margin: 0; + line-height: 1.428571429; +} +.modal-body { + position: relative; + padding: 20px; +} +.modal-footer { + margin-top: 15px; + padding: 19px 20px 20px; + text-align: right; + border-top: 1px solid #e5e5e5; +} +.modal-footer:before, +.modal-footer:after { + content: " "; + display: table; +} +.modal-footer:after { + clear: both; +} +.modal-footer:before, +.modal-footer:after { + content: " "; + display: table; +} +.modal-footer:after { + clear: both; +} +.modal-footer .btn + .btn { + margin-left: 5px; + margin-bottom: 0; +} +.modal-footer .btn-group .btn + .btn { + margin-left: -1px; +} +.modal-footer .btn-block + .btn-block { + margin-left: 0; +} +@media screen and (min-width: 768px) { + .modal-dialog { + left: 50%; + right: auto; + width: 600px; + padding-top: 30px; + padding-bottom: 30px; + } + .modal-content { + -webkit-box-shadow: 0 5px 15px rgba(0,0,0,0.5); + box-shadow: 0 5px 15px rgba(0,0,0,0.5); + } +} +.tooltip { + position: absolute; + z-index: 1030; + display: block; + visibility: visible; + font-size: 12px; + line-height: 1.4; + opacity: 0; + filter: alpha(opacity=0); +} +.tooltip.in { + opacity: .9; + filter: alpha(opacity=90); +} +.tooltip.top { + margin-top: -3px; + padding: 5px 0; +} +.tooltip.right { + margin-left: 3px; + padding: 0 5px; +} +.tooltip.bottom { + margin-top: 3px; + padding: 5px 0; +} +.tooltip.left { + margin-left: -3px; + padding: 0 5px; +} +.tooltip-inner { + max-width: 200px; + padding: 3px 8px; + color: #fff; + text-align: center; + text-decoration: none; + background-color: #000; + border-radius: 4px; +} +.tooltip-arrow { + position: absolute; + width: 0; + height: 0; + border-color: transparent; + border-style: solid; +} +.tooltip.top .tooltip-arrow { + bottom: 0; + left: 50%; + margin-left: -5px; + border-width: 5px 5px 0; + border-top-color: #000; +} +.tooltip.top-left .tooltip-arrow { + bottom: 0; + left: 5px; + border-width: 5px 5px 0; + border-top-color: #000; +} +.tooltip.top-right .tooltip-arrow { + bottom: 0; + right: 5px; + border-width: 5px 5px 0; + border-top-color: #000; +} +.tooltip.right .tooltip-arrow { + top: 50%; + left: 0; + margin-top: -5px; + border-width: 5px 5px 5px 0; + border-right-color: #000; +} +.tooltip.left .tooltip-arrow { + top: 50%; + right: 0; + margin-top: -5px; + border-width: 5px 0 5px 5px; + border-left-color: #000; +} +.tooltip.bottom .tooltip-arrow { + top: 0; + left: 50%; + margin-left: -5px; + border-width: 0 5px 5px; + border-bottom-color: #000; +} +.tooltip.bottom-left .tooltip-arrow { + top: 0; + left: 5px; + border-width: 0 5px 5px; + border-bottom-color: #000; +} +.tooltip.bottom-right .tooltip-arrow { + top: 0; + right: 5px; + border-width: 0 5px 5px; + border-bottom-color: #000; +} +.popover { + position: absolute; + top: 0; + left: 0; + z-index: 1010; + display: none; + max-width: 276px; + padding: 1px; + text-align: left; + background-color: #fff; + background-clip: padding-box; + border: 1px solid #ccc; + border: 1px solid rgba(0,0,0,0.2); + border-radius: 6px; + -webkit-box-shadow: 0 5px 10px rgba(0,0,0,0.2); + box-shadow: 0 5px 10px rgba(0,0,0,0.2); + white-space: normal; +} +.popover.top { + margin-top: -10px; +} +.popover.right { + margin-left: 10px; +} +.popover.bottom { + margin-top: 10px; +} +.popover.left { + margin-left: -10px; +} +.popover-title { + margin: 0; + padding: 8px 14px; + font-size: 13px; + font-weight: normal; + line-height: 18px; + background-color: #f7f7f7; + border-bottom: 1px solid #ebebeb; + border-radius: 5px 5px 0 0; +} +.popover-content { + padding: 9px 14px; +} +.popover .arrow, +.popover .arrow:after { + position: absolute; + display: block; + width: 0; + height: 0; + border-color: transparent; + border-style: solid; +} +.popover .arrow { + border-width: 11px; +} +.popover .arrow:after { + border-width: 10px; + content: ""; +} +.popover.top .arrow { + left: 50%; + margin-left: -11px; + border-bottom-width: 0; + border-top-color: #999; + border-top-color: rgba(0,0,0,0.25); + bottom: -11px; +} +.popover.top .arrow:after { + content: " "; + bottom: 1px; + margin-left: -10px; + border-bottom-width: 0; + border-top-color: #fff; +} +.popover.right .arrow { + top: 50%; + left: -11px; + margin-top: -11px; + border-left-width: 0; + border-right-color: #999; + border-right-color: rgba(0,0,0,0.25); +} +.popover.right .arrow:after { + content: " "; + left: 1px; + bottom: -10px; + border-left-width: 0; + border-right-color: #fff; +} +.popover.bottom .arrow { + left: 50%; + margin-left: -11px; + border-top-width: 0; + border-bottom-color: #999; + border-bottom-color: rgba(0,0,0,0.25); + top: -11px; +} +.popover.bottom .arrow:after { + content: " "; + top: 1px; + margin-left: -10px; + border-top-width: 0; + border-bottom-color: #fff; +} +.popover.left .arrow { + top: 50%; + right: -11px; + margin-top: -11px; + border-right-width: 0; + border-left-color: #999; + border-left-color: rgba(0,0,0,0.25); +} +.popover.left .arrow:after { + content: " "; + right: 1px; + border-right-width: 0; + border-left-color: #fff; + bottom: -10px; +} +.carousel { + position: relative; +} +.carousel-inner { + position: relative; + overflow: hidden; + width: 100%; +} +.carousel-inner > .item { + display: none; + position: relative; + -webkit-transition: .6s ease-in-out left; + transition: .6s ease-in-out left; +} +.carousel-inner > .item > img, +.carousel-inner > .item > a > img { + display: block; + max-width: 100%; + height: auto; + line-height: 1; +} +.carousel-inner > .active, +.carousel-inner > .next, +.carousel-inner > .prev { + display: block; +} +.carousel-inner > .active { + left: 0; +} +.carousel-inner > .next, +.carousel-inner > .prev { + position: absolute; + top: 0; + width: 100%; +} +.carousel-inner > .next { + left: 100%; +} +.carousel-inner > .prev { + left: -100%; +} +.carousel-inner > .next.left, +.carousel-inner > .prev.right { + left: 0; +} +.carousel-inner > .active.left { + left: -100%; +} +.carousel-inner > .active.right { + left: 100%; +} +.carousel-control { + position: absolute; + top: 0; + left: 0; + bottom: 0; + width: 15%; + opacity: .5; + filter: alpha(opacity=50); + font-size: 20px; + color: #fff; + text-align: center; + text-shadow: 0 1px 2px rgba(0,0,0,0.6); +} +.carousel-control.left { + background-image: -webkit-gradient(linear,0% top,100% top,from(rgba(0,0,0,0.5)),to(rgba(0,0,0,0.0001))); + background-image: -webkit-linear-gradient(left,color-stop(rgba(0,0,0,0.5) 0%),color-stop(rgba(0,0,0,0.0001) 100%)); + background-image: -moz-linear-gradient(left,rgba(0,0,0,0.5) 0%,rgba(0,0,0,0.0001) 100%); + background-image: linear-gradient(to right,rgba(0,0,0,0.5) 0%,rgba(0,0,0,0.0001) 100%); + background-repeat: repeat-x; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#7f000000', endColorstr='#00000000', GradientType=1); +} +.carousel-control.right { + left: auto; + right: 0; + background-image: -webkit-gradient(linear,0% top,100% top,from(rgba(0,0,0,0.0001)),to(rgba(0,0,0,0.5))); + background-image: -webkit-linear-gradient(left,color-stop(rgba(0,0,0,0.0001) 0%),color-stop(rgba(0,0,0,0.5) 100%)); + background-image: -moz-linear-gradient(left,rgba(0,0,0,0.0001) 0%,rgba(0,0,0,0.5) 100%); + background-image: linear-gradient(to right,rgba(0,0,0,0.0001) 0%,rgba(0,0,0,0.5) 100%); + background-repeat: repeat-x; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#00000000', endColorstr='#7f000000', GradientType=1); +} +.carousel-control:hover, +.carousel-control:focus { + color: #fff; + text-decoration: none; + opacity: .9; + filter: alpha(opacity=90); +} +.carousel-control .icon-prev, +.carousel-control .icon-next, +.carousel-control .glyphicon-chevron-left, +.carousel-control .glyphicon-chevron-right { + position: absolute; + top: 50%; + left: 50%; + z-index: 5; + display: inline-block; +} +.carousel-control .icon-prev, +.carousel-control .icon-next { + width: 20px; + height: 20px; + margin-top: -10px; + margin-left: -10px; + font-family: serif; +} +.carousel-control .icon-prev:before { + content: '\2039'; +} +.carousel-control .icon-next:before { + content: '\203a'; +} +.carousel-indicators { + position: absolute; + bottom: 10px; + left: 50%; + z-index: 15; + width: 60%; + margin-left: -30%; + padding-left: 0; + list-style: none; + text-align: center; +} +.carousel-indicators li { + display: inline-block; + width: 10px; + height: 10px; + margin: 1px; + text-indent: -999px; + border: 1px solid #fff; + border-radius: 10px; + cursor: pointer; +} +.carousel-indicators .active { + margin: 0; + width: 12px; + height: 12px; + background-color: #fff; +} +.carousel-caption { + position: absolute; + left: 15%; + right: 15%; + bottom: 20px; + z-index: 10; + padding-top: 20px; + padding-bottom: 20px; + color: #fff; + text-align: center; + text-shadow: 0 1px 2px rgba(0,0,0,0.6); +} +.carousel-caption .btn { + text-shadow: none; +} +@media screen and (min-width: 768px) { + .carousel-control .icon-prev, + .carousel-control .icon-next { + width: 30px; + height: 30px; + margin-top: -15px; + margin-left: -15px; + font-size: 30px; + } + .carousel-caption { + left: 20%; + right: 20%; + padding-bottom: 30px; + } + .carousel-indicators { + bottom: 20px; + } +} +.clearfix:before, +.clearfix:after { + content: " "; + display: table; +} +.clearfix:after { + clear: both; +} +.pull-right { + float: right !important; +} +.pull-left { + float: left !important; +} +.hide { + display: none !important; +} +.show { + display: block !important; +} +.invisible { + visibility: hidden; +} +.text-hide { + font: 0/0 a; + color: transparent; + text-shadow: none; + background-color: transparent; + border: 0; +} +.affix { + position: fixed; +} +@-ms-viewport { + width: device-width; +} +@media screen and (max-width: 400px) { +@-ms-viewport { + width: 320px; + } +} +.hidden { + display: none !important; + visibility: hidden !important; +} +.visible-xs { + display: none !important; +} +tr.visible-xs { + display: none !important; +} +th.visible-xs, +td.visible-xs { + display: none !important; +} +@media (max-width: 767px) { + .visible-xs { + display: block !important; + } + tr.visible-xs { + display: table-row !important; + } + th.visible-xs, + td.visible-xs { + display: table-cell !important; + } +} +@media (min-width: 768px) and (max-width: 991px) { + .visible-xs.visible-sm { + display: block !important; + } + tr.visible-xs.visible-sm { + display: table-row !important; + } + th.visible-xs.visible-sm, + td.visible-xs.visible-sm { + display: table-cell !important; + } +} +@media (min-width: 992px) and (max-width: 1199px) { + .visible-xs.visible-md { + display: block !important; + } + tr.visible-xs.visible-md { + display: table-row !important; + } + th.visible-xs.visible-md, + td.visible-xs.visible-md { + display: table-cell !important; + } +} +@media (min-width: 1200px) { + .visible-xs.visible-lg { + display: block !important; + } + tr.visible-xs.visible-lg { + display: table-row !important; + } + th.visible-xs.visible-lg, + td.visible-xs.visible-lg { + display: table-cell !important; + } +} +.visible-sm { + display: none !important; +} +tr.visible-sm { + display: none !important; +} +th.visible-sm, +td.visible-sm { + display: none !important; +} +@media (max-width: 767px) { + .visible-sm.visible-xs { + display: block !important; + } + tr.visible-sm.visible-xs { + display: table-row !important; + } + th.visible-sm.visible-xs, + td.visible-sm.visible-xs { + display: table-cell !important; + } +} +@media (min-width: 768px) and (max-width: 991px) { + .visible-sm { + display: block !important; + } + tr.visible-sm { + display: table-row !important; + } + th.visible-sm, + td.visible-sm { + display: table-cell !important; + } +} +@media (min-width: 992px) and (max-width: 1199px) { + .visible-sm.visible-md { + display: block !important; + } + tr.visible-sm.visible-md { + display: table-row !important; + } + th.visible-sm.visible-md, + td.visible-sm.visible-md { + display: table-cell !important; + } +} +@media (min-width: 1200px) { + .visible-sm.visible-lg { + display: block !important; + } + tr.visible-sm.visible-lg { + display: table-row !important; + } + th.visible-sm.visible-lg, + td.visible-sm.visible-lg { + display: table-cell !important; + } +} +.visible-md { + display: none !important; +} +tr.visible-md { + display: none !important; +} +th.visible-md, +td.visible-md { + display: none !important; +} +@media (max-width: 767px) { + .visible-md.visible-xs { + display: block !important; + } + tr.visible-md.visible-xs { + display: table-row !important; + } + th.visible-md.visible-xs, + td.visible-md.visible-xs { + display: table-cell !important; + } +} +@media (min-width: 768px) and (max-width: 991px) { + .visible-md.visible-sm { + display: block !important; + } + tr.visible-md.visible-sm { + display: table-row !important; + } + th.visible-md.visible-sm, + td.visible-md.visible-sm { + display: table-cell !important; + } +} +@media (min-width: 992px) and (max-width: 1199px) { + .visible-md { + display: block !important; + } + tr.visible-md { + display: table-row !important; + } + th.visible-md, + td.visible-md { + display: table-cell !important; + } +} +@media (min-width: 1200px) { + .visible-md.visible-lg { + display: block !important; + } + tr.visible-md.visible-lg { + display: table-row !important; + } + th.visible-md.visible-lg, + td.visible-md.visible-lg { + display: table-cell !important; + } +} +.visible-lg { + display: none !important; +} +tr.visible-lg { + display: none !important; +} +th.visible-lg, +td.visible-lg { + display: none !important; +} +@media (max-width: 767px) { + .visible-lg.visible-xs { + display: block !important; + } + tr.visible-lg.visible-xs { + display: table-row !important; + } + th.visible-lg.visible-xs, + td.visible-lg.visible-xs { + display: table-cell !important; + } +} +@media (min-width: 768px) and (max-width: 991px) { + .visible-lg.visible-sm { + display: block !important; + } + tr.visible-lg.visible-sm { + display: table-row !important; + } + th.visible-lg.visible-sm, + td.visible-lg.visible-sm { + display: table-cell !important; + } +} +@media (min-width: 992px) and (max-width: 1199px) { + .visible-lg.visible-md { + display: block !important; + } + tr.visible-lg.visible-md { + display: table-row !important; + } + th.visible-lg.visible-md, + td.visible-lg.visible-md { + display: table-cell !important; + } +} +@media (min-width: 1200px) { + .visible-lg { + display: block !important; + } + tr.visible-lg { + display: table-row !important; + } + th.visible-lg, + td.visible-lg { + display: table-cell !important; + } +} +.hidden-xs { + display: block !important; +} +tr.hidden-xs { + display: table-row !important; +} +th.hidden-xs, +td.hidden-xs { + display: table-cell !important; +} +@media (max-width: 767px) { + .hidden-xs { + display: none !important; + } + tr.hidden-xs { + display: none !important; + } + th.hidden-xs, + td.hidden-xs { + display: none !important; + } +} +@media (min-width: 768px) and (max-width: 991px) { + .hidden-xs.hidden-sm { + display: none !important; + } + tr.hidden-xs.hidden-sm { + display: none !important; + } + th.hidden-xs.hidden-sm, + td.hidden-xs.hidden-sm { + display: none !important; + } +} +@media (min-width: 992px) and (max-width: 1199px) { + .hidden-xs.hidden-md { + display: none !important; + } + tr.hidden-xs.hidden-md { + display: none !important; + } + th.hidden-xs.hidden-md, + td.hidden-xs.hidden-md { + display: none !important; + } +} +@media (min-width: 1200px) { + .hidden-xs.hidden-lg { + display: none !important; + } + tr.hidden-xs.hidden-lg { + display: none !important; + } + th.hidden-xs.hidden-lg, + td.hidden-xs.hidden-lg { + display: none !important; + } +} +.hidden-sm { + display: block !important; +} +tr.hidden-sm { + display: table-row !important; +} +th.hidden-sm, +td.hidden-sm { + display: table-cell !important; +} +@media (max-width: 767px) { + .hidden-sm.hidden-xs { + display: none !important; + } + tr.hidden-sm.hidden-xs { + display: none !important; + } + th.hidden-sm.hidden-xs, + td.hidden-sm.hidden-xs { + display: none !important; + } +} +@media (min-width: 768px) and (max-width: 991px) { + .hidden-sm { + display: none !important; + } + tr.hidden-sm { + display: none !important; + } + th.hidden-sm, + td.hidden-sm { + display: none !important; + } +} +@media (min-width: 992px) and (max-width: 1199px) { + .hidden-sm.hidden-md { + display: none !important; + } + tr.hidden-sm.hidden-md { + display: none !important; + } + th.hidden-sm.hidden-md, + td.hidden-sm.hidden-md { + display: none !important; + } +} +@media (min-width: 1200px) { + .hidden-sm.hidden-lg { + display: none !important; + } + tr.hidden-sm.hidden-lg { + display: none !important; + } + th.hidden-sm.hidden-lg, + td.hidden-sm.hidden-lg { + display: none !important; + } +} +.hidden-md { + display: block !important; +} +tr.hidden-md { + display: table-row !important; +} +th.hidden-md, +td.hidden-md { + display: table-cell !important; +} +@media (max-width: 767px) { + .hidden-md.hidden-xs { + display: none !important; + } + tr.hidden-md.hidden-xs { + display: none !important; + } + th.hidden-md.hidden-xs, + td.hidden-md.hidden-xs { + display: none !important; + } +} +@media (min-width: 768px) and (max-width: 991px) { + .hidden-md.hidden-sm { + display: none !important; + } + tr.hidden-md.hidden-sm { + display: none !important; + } + th.hidden-md.hidden-sm, + td.hidden-md.hidden-sm { + display: none !important; + } +} +@media (min-width: 992px) and (max-width: 1199px) { + .hidden-md { + display: none !important; + } + tr.hidden-md { + display: none !important; + } + th.hidden-md, + td.hidden-md { + display: none !important; + } +} +@media (min-width: 1200px) { + .hidden-md.hidden-lg { + display: none !important; + } + tr.hidden-md.hidden-lg { + display: none !important; + } + th.hidden-md.hidden-lg, + td.hidden-md.hidden-lg { + display: none !important; + } +} +.hidden-lg { + display: block !important; +} +tr.hidden-lg { + display: table-row !important; +} +th.hidden-lg, +td.hidden-lg { + display: table-cell !important; +} +@media (max-width: 767px) { + .hidden-lg.hidden-xs { + display: none !important; + } + tr.hidden-lg.hidden-xs { + display: none !important; + } + th.hidden-lg.hidden-xs, + td.hidden-lg.hidden-xs { + display: none !important; + } +} +@media (min-width: 768px) and (max-width: 991px) { + .hidden-lg.hidden-sm { + display: none !important; + } + tr.hidden-lg.hidden-sm { + display: none !important; + } + th.hidden-lg.hidden-sm, + td.hidden-lg.hidden-sm { + display: none !important; + } +} +@media (min-width: 992px) and (max-width: 1199px) { + .hidden-lg.hidden-md { + display: none !important; + } + tr.hidden-lg.hidden-md { + display: none !important; + } + th.hidden-lg.hidden-md, + td.hidden-lg.hidden-md { + display: none !important; + } +} +@media (min-width: 1200px) { + .hidden-lg { + display: none !important; + } + tr.hidden-lg { + display: none !important; + } + th.hidden-lg, + td.hidden-lg { + display: none !important; + } +} +.visible-print { + display: none !important; +} +tr.visible-print { + display: none !important; +} +th.visible-print, +td.visible-print { + display: none !important; +} +@media print { + .visible-print { + display: block !important; + } + tr.visible-print { + display: table-row !important; + } + th.visible-print, + td.visible-print { + display: table-cell !important; + } + .hidden-print { + display: none !important; + } + tr.hidden-print { + display: none !important; + } + th.hidden-print, + td.hidden-print { + display: none !important; + } +} +.navbar { + margin-bottom: 0; +} +.navbar-inner { + border-top: none; +} +.navbar-inner .container { + width: 1170px; +} +.navbar .btn { + color: #fff; + background-color: #f39922; + border-color: #ef8d0d; +} +.navbar .btn:hover, +.navbar .btn:focus, +.navbar .btn:active, +.navbar .btn.active, +.open .dropdown-toggle.navbar .btn { + color: #fff; + background-color: #e0850c; + border-color: #b46b0a; +} +.navbar .btn:active, +.navbar .btn.active, +.open .dropdown-toggle.navbar .btn { + background-image: none; +} +.navbar .btn.disabled, +.navbar .btn.disabled:hover, +.navbar .btn.disabled:focus, +.navbar .btn.disabled:active, +.navbar .btn.disabled.active, +.navbar .btn[disabled], +.navbar .btn[disabled]:hover, +.navbar .btn[disabled]:focus, +.navbar .btn[disabled]:active, +.navbar .btn[disabled].active, +fieldset[disabled] .navbar .btn, +fieldset[disabled] .navbar .btn:hover, +fieldset[disabled] .navbar .btn:focus, +fieldset[disabled] .navbar .btn:active, +fieldset[disabled] .navbar .btn.active { + background-color: #f39922; + border-color: #ef8d0d; +} +.navbar-default .navbar-toggle .icon-bar { + background-color: #fff; +} +body { + background: #FFF url(data:image/jpeg;base64,/9j/4QAYRXhpZgAASUkqAAgAAAAAAAAAAAAAAP/sABFEdWNreQABAAQAAAAyAAD/4QMtaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLwA8P3hwYWNrZXQgYmVnaW49Iu+7vyIgaWQ9Ilc1TTBNcENlaGlIenJlU3pOVGN6a2M5ZCI/PiA8eDp4bXBtZXRhIHhtbG5zOng9ImFkb2JlOm5zOm1ldGEvIiB4OnhtcHRrPSJBZG9iZSBYTVAgQ29yZSA1LjMtYzAxMSA2Ni4xNDU2NjEsIDIwMTIvMDIvMDYtMTQ6NTY6MjcgICAgICAgICI+IDxyZGY6UkRGIHhtbG5zOnJkZj0iaHR0cDovL3d3dy53My5vcmcvMTk5OS8wMi8yMi1yZGYtc3ludGF4LW5zIyI+IDxyZGY6RGVzY3JpcHRpb24gcmRmOmFib3V0PSIiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1sbnM6eG1wTU09Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9tbS8iIHhtbG5zOnN0UmVmPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvc1R5cGUvUmVzb3VyY2VSZWYjIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKE1hY2ludG9zaCkiIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6REQxQTRFNjExMUMwMTFFMzgyRkZGOEQ5NUMwQUQyQjgiIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6REQxQTRFNjIxMUMwMTFFMzgyRkZGOEQ5NUMwQUQyQjgiPiA8eG1wTU06RGVyaXZlZEZyb20gc3RSZWY6aW5zdGFuY2VJRD0ieG1wLmlpZDpERDFBNEU1RjExQzAxMUUzODJGRkY4RDk1QzBBRDJCOCIgc3RSZWY6ZG9jdW1lbnRJRD0ieG1wLmRpZDpERDFBNEU2MDExQzAxMUUzODJGRkY4RDk1QzBBRDJCOCIvPiA8L3JkZjpEZXNjcmlwdGlvbj4gPC9yZGY6UkRGPiA8L3g6eG1wbWV0YT4gPD94cGFja2V0IGVuZD0iciI/Pv/uACFBZG9iZQBkwAAAAAEDABADAwYJAAB+qwAAf6kAAMQb/9sAhAAIBgYGBgYIBgYIDAgHCAwOCggICg4QDQ0ODQ0QEQwODQ0ODBEPEhMUExIPGBgaGhgYIyIiIiMnJycnJycnJycnAQkICAkKCQsJCQsOCw0LDhEODg4OERMNDQ4NDRMYEQ8PDw8RGBYXFBQUFxYaGhgYGhohISAhIScnJycnJycnJyf/wgARCAZACgADASIAAhEBAxEB/8QAxQABAQEBAQEBAQAAAAAAAAAAAAECAwQFBgcBAQEBAQEBAAAAAAAAAAAAAAABAgMEBRAAAgEDAwQDAAMAAwEBAAAAAAERECACMFBgQHAxEoAhA0EiMrBCE8AzEQACAQMCBQMEAwAAAAAAAACAAREAkCEQcSAxQWESQFECMKDQkeCxUhIAAgMBAAAAAAAAAAAAAAAAwCEAkKDQEwADAAEEAgMAAwABBAMBAQAAAREQIDAhMUBQYEFRcGFxgYCRobGQsNGgwf/aAAwDAQACEQMRAAAA/eSzHQAAgqCoKlFlWpQFIi2VVlBCgtllthaIWUtmprXXn2x09Hp8/p477bxvly2JmhKg315dunPprOvbyU6QAKAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAABCoioKgqCoKloAAKAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA/nazHQsAIsAFAFWUWVQiWUWVQFlBRZZqpSiGpVus6munbl359e3q8/p4Xe87xytJmoKhOnfj378t2X2c6NQAAAKAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAABIqCwBJaiKyjTNqoKgqKoKiyigAoAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD+djHSyiBQAAAFlVZYQFlVZQBZRZVoloKWLZZW87muvo4ejl37ejj2456azrHO3JmoVvn1s69ufX1cNF9OAsAAAACgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAiAUiKiLEKkysmca05sXq52zdxdNMrNIrTNq3N1KlpYsooAKAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA/ngx1AAgAAAKFUhBaCpQBZRZZaFULZZdWWW7z0zvr349+Xbt15deWOmsazipEskt334eljt0xv2+a2XrkKAAAAACgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgABCBJbEgTNqCxMrlnGmGeWrJMa3rnbOl53U3cLN3na3eds3cXU3c3pLc3ctjUqWgAoAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD+eDHUABLAAAVQAgFoFlAFlFllWVaIus6W6ms6vXPXHXffl25b6dOe8Y3cWZ1mRazuu3p4em8Ompr2+dTpAAAAAAAAAoAAAAAAAAAAAAAAAAAAAAAAAAAAAIEgFIyRM2yMrIzaylskzbhnFRnGyJbcjoxbNXJNM01cWzVys6a53eelxrrnVzekqXSosooKAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA/ngx1AAQAAFlUAAJalFgoFlVZYWVaIupprW87xvfXn1x16dcdOV3cs50wNyC9uXome3o5du3l3ZfXyo1AAAAAAAAAAAoAAAAAAAAAAAAAAAAAAAAAAAAIASyEslQwkTGkk56qSKiVEzWUzYkmrECF1cVNsjVzTVyTVzbNXFs6a563npca7Y0jc0jS2NSigoAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD+eLMdiwAgAQFUAAAlUFlAFFUihVmpbrOpem8dMdd9efXG+mudxejnI6XntdpuTp3598cO3XHT1+W09GaLAAAAAAAAAAAAAAoAAAAAAAAAAAAAAAAAAAAIAEgFQykuedkTnqROerIlsiWySESVmxpEpEXVyNXKTdxo0hLYNXJN3Fs665b6Y3ca6Z1c3pLc3ctjUooKAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA/nox2SyAqAAFAAgKFlAWCgoloWgtmpbrOprp059Mdemuesb2wjbnV7b59c3XbHbHLp359s+fp0xv28KXtAsAAAAAAAAAAAAAAAACgAAAAgAAAAAKAAAAACAAhAElSzKZ1nnrObjhtJMarJakKSVLCSxZC1BSDSDWsakthNM2Lck3caTWsas3rF6Y3c3pNXN6Z1c3pLY1KKCgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP56OfZLBLKAAWCgAAWWUBZVAoi2VVlLZZrWs6zre8azvaTO9TOa6a59Jrv35d+V3359ufn6defW8Oms69vKjrKECgAAAAAAAAAAAAAAAAAAAAAAAAAAAoAIAAAAQgSUIhM1jWeWsY1jjuQzqElqQ1IKhWblUS0gqClLc6kqUqEoLrOpLrOrNXNudXN1NaxrpnWsa650l6ypbAoKAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA/n0s590sRCiUACFKACVZQBRQLZYWVbZZWs6W6zc66XNzvUkW4srp25dcdPT6OHq4zp0zvn5+nXl03x6azr2c6OsoQAKAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEgFEgIQyRM2ZuOW5jWeW8jOpnWQFELEES2RGiC2UtlRYjSVFg0lS2WNazWdWLm2Wy6xrU1rG+2dXN7ZtzdKNQKAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA/n0s59oSksFlAAKAAFFgChVlhZVtlVYi2F1rFl6M2bqJRTp349+fb0+vy+rhy6bzvHDXTG9897xr2c7ZesCqhKgqCoKgoAAAAoAAAAAAAAAAAAAAAAAAAAAIIAlIBMrElsTJLnFmdZ57zjeeeshqTUiSxYRUKkRZLFC22WS2VAipSpUtzotlk1ZWbc2y2VLZdTWsb651c67YDbSXcCgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP59LOfeSyyAWUAAUAAlUBVFBZVUCUBYW6zZdWWaBW8dJrp34+nl17+nz9+PLr059M8N7xvXPes31c9WO0o0AAAAAAABFgqCoKAAKAAAAAAAAAAAAAAAACEsAlEBMhJQygzZLM3MsxrOdZ56ksVKlk1DOd5XMubpLCSxZZbbZZKAJKBYNaxpNXNk1ZUtlS2W5tzrUus66Z1Ze2aXpFl1AoKAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA/n0s595LLIBZQACiAVZQFoFWFlWhQgQqDVlmtWWbAvTn2zvp6OHfl079+Hfly6dOfTPHpvG9ct2X087Ze0qXYAAAAAAAAAAAABYSoKlAAoAAAAIAACgAAAAiBRICEMkM1CVDKEzZnWcazLMakpYslAmd5XGd5tzLGszUtllLYktgoihALZTVlmbrOkqVLZbLZbNaxrpnWs3tjQ6SjUo0CgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP59Lnn3kssAoAFlgFFJQUVSFChaQpFACLZZrVlmqF3159cdenbl2577d+Ho5cenTn0zw6bxvfLVl9GaOuaNgAoAABYKgqCoKAAAAAAABYSoKAAQoAAAAAoAISwBUsgIkszUMVEysJUslzLMazNZxQWAgVKjGd5XGdS6zNRc0tokWC2C2IqUtlTVlmbZUqUtlZtls1rOumdWXtnSXpmpdllsCgoAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD+fZ1nn3kssAoAFJRQBRRQIoKhagqCoFlW6zrOrrOpsVenTn1x069uPblrt249ufHp059M8um8b1y2l74tjtLY3KiqgpCgAAAAAAAWKqCoioKiqAAAAAAAACoSoKAACBQiACJKzZLMWSzNCEslmdTNmdTFysmosEsAlznUXGd5usyxYsWpQCpUWCpY1c1NaxqTSE0lS3NTWs2zdzreN2Xtm3OukWNyiyjQAKAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA/n2dZ594LAABQJaAVQBRYioKlUAABSW2Gt3NmtaxvOunXl1x16+jj6OTp1x058Nbzqc+m861z0O2bc66yjrCKqCoKgqCpQAEWCoKgoAAAAAAKgqWgAAAAAAFgqEsAFEgISwDKSs6zLMUTNAkszZLM2SpZLJUAJcyxc51Lc51GpLFAAqUqVFg1c6ktzpLZZLYi2LNazpnWs66Y3Y7Ztjc0l1Kl0WXUCgoAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD+eyzn2goAIoAWgFUAEqVQgFWCoKlWiFlW6zZrW8dJvp15defXt6PP35O++e+fHrrnuc+2+fTfKjrmazrTSXvmE0qCpQAAAAACoKgqCoioKgqVFgqWgALAAWCoKlAAAoAABLICEsgJZLM2SzNgxUISyWSzNkslSyWBUSGbFkubqSxZLFAAWCpRZS2JNXOk1ZZFJKWy6zpnWpemNXOukqXcqXUtjco1KNAAoAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD+ey559goABZYBaBYKFABKJQUABZVWIthbrOpddeXbPTfXn059evbj25u2ue8cunTl1zz7dOfTfGjrnOsaXdl9GJLNAoAACoKgpCgAAEiwUiKgtzUqUqKqVKiqlAAAAFgsCpQKACIAIggSVLM2SzNksxSJUTNElQlRIEVEVmxZEWEVLFAAAAqUtzU1ZZNazqS2VlZS6ludazdZ1c3edJdypdy2XcqXZZbAoAKAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA/nubMdgAAFIBaACpVAAUgFBAVZVFgFus6Xfbl159um8bx069eXTnOuufTOOvXl1zx7dMb1wo6TFzZrpc69GGdZ6AKgqCoSigAAAAgRRIqIqCoLYKlqos0goAAAQCoqpQAAAAiABJRM0SITGoTFSTNsklqSWoCSWxFRFSwkuVRFEtsAIAqCgtzo1qWZ1ZZm2VLc1NXOrNXN1nSWy3N1NXN3NXOusWXcWNSgCgoAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAI/nksz2AAKAlUAAKlUACpYILFAVRVlgVWpqa6deXTHXpvn0xvr057w315dcY69uPbHHtvG98LE1MpZrprOvTiZ1joqCpaWCoKgqC2CoKgsAiCJSIqC3NqoLYS2KoqoSoKlAKgqUAqEqKqCogFQhEzbCETNRM2RMaSM6QhEWpCyJbICFRFksWEtILBVgqCoipS6zpN6zuYtJKEWUtlS6zdZtlsqWy6zrpLZeubY6SillsCgoAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAI/nkrPaFJSAVQJQAFWUAAAAUlAoWiFFupqa3057x16dOXTO+289Oa9cdcY335dscOms61yubmzNzbrtrOvTznPfPdXI0zatyNM0qDTJNIKgqCyJbELEipJdMjSDTNs0zTVzatiyoKgqUAAWCos0yNIKgqIIBM0klsjNsklskzWbnFsSUklshSQshayWoEFkuVRFqCoKQqCgWWLvO2dazqZtlkWVFgtlTVzbNXN1m2K1rN6Z1ZeuaNypdAsooAKAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAASzL+eidgAlAAWChQFAAAACiVZQVQlpVus6mtbxvO+nXl1xvv159+K9c9MctdefTPLeo3yS5XFxq79Gs69PHPLtx1csrdsq1cU0yTTNNMjTI0yNMpdSQ1JI0yisl0yNM00zU1c2tXNs0ircioLcjSCoKg0hKiqiKgsQqSWsosyzbMs6skysklszM3UzGtSSNSRbEWyCoKBLFkZWwUgoAAFgtljW8bmdazpm3NkthKC2VLZbKizVzbNazd51Ze2bZdxZdA1KKACgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEsy/nonYIBQAAKFFAAAAFllAoVZYFVZVuprOrvG5vp15due/T249uM6dOfTHHe8dJz1Y1hm5XnrGtb9Ws69PCce3G3iwut3mOjBOjnTbA3cDbA2wXbCNMyNMxdsSNsDbCN3nTdxa3c3U3cWzVyrTJNMl0yNM0tyTTNNM0qKqIqCyIJJbJM25TNSTN1MyXWZFSSarI1JF0yKkWoKgqCxJUsoFiyFgqUAFFljW8aZ3c2Z1YktlKlS3NstlSoLZbNazd53c67Ztl6ZWXQLKKCgAoAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIQy/nonYFAAAUUCxQIAAUUBZVAWJaFtll1rOprW8bzrp25dcb9Hfz9+Weu+fTny3vG3PVi5mN8157573v1759O/Bw78a8UmHTo5tTq5U6uVjpeQ6uY6uaOjmXpMSOkwjbmXbmOjmjo5l6XnU6a5as6a56s3cWzbKtMjTI0yjTI2yrbNNM2zTI0yKkjUklqSEZzblnOrMyWyRbJmXUkXUkXTNKzSxFqCoKgsAbNdNdcY8uPXwXztTW4FqVALZY1c6TWsbmbZUtlkqVFlstgqC3OrNazredazrri3N6yjUopZbAoAAAAAAKACAAAAAAoAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAASAzf57LJ1ClllAWVQAFiFABRQUBQCFlUFtll1qamtbxvOunXn0x079/P25Z7dOXXHHprO5zouc43hrlrOt79Pbh27ee8uvOvmcuvld+jnNTq5LOzkjs5Ds5F7ONjq5I6zkXq5I6zmOjml6OY6XnTpedTrrlqzreWk6Xms6XlTo5w6OaOl5VejnU6XnTpeds3cWtXFs1IiyFskjUkzbmSW5ZluWZqyRblFJFqQ1cjTNLcjSColqAB15dU9Hfzeicb5vZys8k64nXjneGwWgtzU1ZZNazqZ1c1NJUtzZKKtzUrNLc6NbxreN3Ou2LZeko1Kl0CygAACgAAAAABIqCoKgqCoKKACgAAAAAAAAAAAAAAAAAAAAAAAAAAgKAAAAAAAAAAAACAEISzN/n0L1BVIFAUABSABVABRQJQFFFGs6l1qamr0x0zvfTnvGu/Xh15vR28/o58d7xucdQszjfNrmTfT0+jyenpw1jeN5+Z4fd4HosjSsyzbFNsI6OZejnTo5WOk5pejEOl5o6OdXd506Oek6XnTreVTrrjU6uQ7ONOrkOrkOrkl63jpO1407XlU7XlbOrnU2wNzI1MyXUzJdTMlskW5ZlskWxLbIW3PSMvRzjksqoNIKgqCoL05aj0dvJ0c/dPPWLw6cpvnmx0C1ZYalS2WTVzpLZZnSUqVLYSgCLc6s1rN1nesa652l6ZtjeaNKloLKgqAAIClgqAAIBQBIqCoKALKiqKAACgAgAAAKAAAAAACBCoioKloAAAAQqIqCpQKCgAAAAAAAAgASLADNhMv5/K12lAUlFAAWIoAWgAFWUUIWUFUC6mpq7ms6u87zrWsbzrr05dMO/p83p58um86zwssszz6c2+cuN77erxezfPpmzfL5/zPqfLelE2RLKgqIqFqCso0yXSItzVtzSoNXJN3FNsDo51NsDd5l6OY6OY6OY6a42O2uNTtrjU7a407XjqTq5k6MDcyWyZlskWsyXUgRFshVlLvPST2c+txz8GPZx1vzunO6XNWoKgqCoN6wjowTpMCwWgWWKlS2WTWs1NJZLc1NM00hLYi2VFls1c6s1rGumd3N6Z1c3ebc3SpbFiqiqgqIqCoKiqgqIqCwgAiKkl0yjSNS2KooLFiqgqCoKgsAIWKooAAAAAQsICUAAEAAAAABQFhKNAoIAAAAAIioKgsAJQhCEszf5+N9QFlUAABZYBRQAVQAUWAFFWWW7zuau86zvWpc26zqa6dOfXLv6vL6ePHrrG5wsubM89c70nO53vr6/F7Lz6xNcvH8v6vy3ozLOlmN87KiyogFIKllAWFqWKBZQCpRYKhKiqkNMioWoi3NNaxTdxU6XFN3Fk3cU3edk2xSySWxFJFqQqFILc2OvTl0mfb18/pnHl5/VwmvNy7c9decubq2FqIqC6zTUgtiKCpUWUCLZUtlk1ZUqWKEqVLc0thLc2NJUusas1rGt51rN3nVzdzSNTSNSiqhKiqiKgqCoKgqColILDIjIjNqDSXctzdKl1KiqKAAAAEKiKgqCoq2LAUEABQgIACgAAAAAAAgKWLLABQQKAAACAUASKgCEshDF/ADr1AoUACgACVQFAUAqUAUBVll1vG5ves7zvVlzq7zuXfTn1xnr6OHfny67xrPG5uUxw7ebfZJd3p6/J63PtnWby8nyvqfJvoSOhm5sIsqJagqVQhYKgtiW2CpSoKACoqwCCoKgqUCLYNaxo1c1NXNNXNk0gqCyJRFQhBRFqBYOnThuT1+nwenGPTylc/Hx9XnvbkudbqUqCiKlFgtgtiLYSgWWLYTVlNJZm2C2JLYLYTSChKljVzU1rGtTdxdZ3cXedXN1NM3U0zSoqoisjTKNMjTI0zSoKkKiKkzakiwzVzY1c3ctzdy3N3LY1KSqgqCoKiKhSIqIqWliyiliqgqCoAgAACoqoKgqCoKgCAAAqoKiqAAAAAgqAAICEIQlSzF/Ajv0AWChQKAIUUUBQCpQFlUAJbZVu8bmt7xrO96zvG7ubyvXHTOenfl258em8bnKZ1k5eb0+bp1xZN3v7PD7Zz75uXLyfI+t8jXokjrblGQsBViKFAWIqC2FqDSUWCpQBYAAAAAVYipS3NTVzTVxTdxU2wjbA0yXUiKhSCoWwgBrFXp38usz3vNcS88Z3bktAoVZUWIoKlKIoKEFFli6zU1c2S2VKlKJKgoSoLc01cpN3NTWsWzbN1NXFs2y1NsrNMjTKKkjTKXTCNsDbI0yTTI0yNMlqIqIqUWNTVys1c3bdl74SqyMUIAACBCgCqiqKWLKgqCoKgqCoKgqCoKgqCoKgqCwKgqCoKKACgAABIqCoipFqICCJUsy/BQ9PRYipRYKFWCiWhVlAgVQAWiUpYoWU1rOpve+fTOt9M9Oe7tvMdM6znr15dccem8bnOZ3g5ef0+bfXnm563r7vB7c49GWJz8fyvofO6d4OkRLKhKlUIAAWFqWAKlFlFlAAKgqCoUBYKFACKCoTVyNXI0iNM1agqColsAAAJQKg1cUsCpVBFiW2bkl66k87rhc0qiKChFlFli2VLYk0lKhNIjSCoKhLYLc2NXFTdzU1crNs1NM2zTJNIKyNSJaiKgqCoLc1KgqCpRYKgqC2LKKtzdTprG/TiytzM1nFg50IACgAFiygCliqgqUAIKlAAAAAAAAABCgCwAKWCoAAlIKiACIqCoUIIgJfwJPVqgFlAWVQKJaFolAUAVYLYmqABZpbrOs63059c76defXnrepvGbqamN9OfTPPpvG5yZ1K5eX1+XXbhDrrfu8ftzz3jfLOfn+D2ePt1DckssFJQCAAAUIUoCiKlFgqUCgAgFAWVQAgCpRYLYKlhYKhaIqCoLBVgqCpQIAWUBVlAi+nzerOfTd6xw8fH1eXXXmNboigqUCSpS2VLYi2VFgoFhKlgCpSpSpZLc1NXJNs0tyTSDTI0yTSCoKgoKhKBZQIKsAAAWCiy2K3rnemelzr0ZZ1mJE4aqCgpdwXUiqkrKCFgqKoAoAIAACgAAAAAgAWitwrSKqKIqJLISzFIiolEiolsiKgqCoKgqWvwJPVqgWWUBZVBbZYWVQlKAUACpVCWpS2WW7zqa3159cdOvXn15tbms41Zc51059Jjp0xtyTUTj5vV5b28tzvtvv6/P6ccnHt5Y+f5uvLv0DUgBUiliiKJQACBSKAFABZQKCAUUiiUAlAAFAFlhZVAAoAgFAAWCgCAFlAFlVYkvbj0k+n159p5fL4vp+CdfOs12WWFlAShVlkWUqVLc2Lc1Kg0gqUCKlRYLYNIktg0hNIjTJNILc0qVAKlFhKlGpuyXd1jnd3TDbUxNzNxNzFyslAWDUEqWtb5b653lnUQ5aqCos1rF3NpesCxLJUMUjNqLKAAAAWwXSKqLISzNsAAIAAtzdzSNzSNKgqKqSLExUTnakzajKyIsiWoghag0iqiyoPwg91AFlAoUVVllUVZYBQAAAWgWWW6lmrvO5rfXn1xvr159ec3rO8YaiTXTn0mOvTn0ck1Lnl5vV5nbxam+3T19+fTnxz4vX89vxY1PRqLECgBYiiKIoiiVViwKSUAFAFFIoACBVigBKAColAVQCgIAKIoillAIFIolAAoACL056j6vo8Pq5+W+L1eRrzZ1nfoWWliKBZUWUWWASgoKlhYSoLYKIqVKlFgoipUWC3NkoKlSpSoSgpUabuW2u2Cu2YqoqJNIzNzN5uk53E3M3m1nFCWoq6xU1IqgBKircq3cXU2y3NMqsTFqIqUCgAALc63LZe2VNJNTLM1nlSOdsFAACFkrSLLcq0yNMq0yiyM2xIsTNqIElsSKhRCoLc0qKqD8MPowBZZRVAWWWhaJVAFAAAAoW2WW6lm9bxvOunXl1xrt15deed6zrOLNSNdeXWY67xtxss1Ofn9HHPXw9cejr19FTnx5/M9/wAvp15rOqKsiiKIoAFIqIpZQAlAUiiKJQAKIoBQCiKAgUlAUigWIpQBSKIqJQBSiKJQAKiKBSKJVjfp8dk9fDEgt0iolAUlBQUkAoFlAigBKlKlAihKlKgoipUAthLYipUqUus7ZaauW5emLY6y2NypaAqLKgSzNkueWpnWeWoTFqCgWCosoKgqUCqhKiqg1ZvpJa65zLOdgxQALc2t3Gu+dI6SxIZueVI46oJSkoiiLIEioKhagqAgsIIlEiwUiBFsABYKiqg/ED6UAUhRQFWVZVBVIABQAFlFlltmppqWavTG5vfXl0xrt149cTpvl0xz0iTfXj2mOu8bcbLLOfLrznTzd501vWbymPL4PR5+3aLNwEFIoiiKJaIpYoiiKIolAUiiKIolIlUiliiKJQFIqACiUBSVViolAoiiKJSACiKIpQCoigUlAoa31znh17GOGfRzXg6Vrk6jldwy1TLQy0IoAKgEUBQBZYBFlAKEWWAFlSpQIoS7xU7XlvWNpdZusNzbEOk5zF6uVOl53c6MXU0wLmY5a1MueqhaAEqCpQCoqoKEAqC2Wze8b9eLK6zGemeNxLPPsiKAC3Ns0y00yqyMqli1ekK6QrSTUMzU5XMueWgyAABSCxIsFEiwEFEgRagqKqCoPxQ+nkCiKFWUWWWhQloAABVigWFmmlWW2amruazrXTPTG9bzrM6b57znVlmb15dJjvvnvPHSNZxjpibl1Lc+bv4bvzYs76ikiiLSKIolAUiiKIpYoiiKIoFIoiiKIoCBSKIoilFIoiiVYigpQAgoigAUiiUgAoigAu0xfVbjxvbyXz2s737vF6Jy9fL0Y68fLnvjn0zq3mk2jnOw4zurz3tF4Y9PK3jNS7lAUAKABUCBSUFAEUgBZUWCgWWRZS7xbnpeds3MyNTKWsi6xTpcLnbENzKUVS6TDcSBQAAFhKlAAFgqWxYNdOW+2ejDvnczMmdThrKzFApdCrIqstTLKzNtyrdxdzoxrrnTLbUzMtZk5aROWqiABCoWwggsAhQhBSARbCiCkKD8XK+ngCiKFWWWgoUCpZQClFIqFFVZWpWrqal1ubxrW5vGmiN657znes2ZvTnuZ7759M8bZbnM1FY1za5fP9Pk69c53nogQUAAKAAgAUBQAJQAAFIoAAAFJQCCliiKJQUAhQAKJQAKIqJQANjDUIoFJqcReGtb9Hr+Zpj6PDtyxl247l+lrzdtebLo05zTFjaMXRIqs53jNnPpib4Z6Yu5KalBZUAFAgUFSWiLAUCABUAqUWWRZRYKlSwAAAKaTLcI0SWkupveU065xnrnGuc1OepLJaAAVJVItszdKyqIsLrCtSAIqDUiqE1c63KOko1JLOdzLOWglILcjTKtSIsQqJQABCoLAEWwBIEUARRACwUAK/GD6fJZZRQFVZRVAFiUVRVUlIKUpVWVZZdbzua1vHXF1uaxbLIu+e03qXObrGpO/Xj1zx1ZbhNZrny6cJ18XLeO+4ssgoAACpQIAAqUBQAAAAKlAgAUhQAUAAACVZQCgFAAFIAAKAFmztu98c/Hx+j4muTfXV897czON5t8+dXe5OnpzJbcZerz+6850nTpxGumOTTGoSKky0yW43MMZ1jO+XPpzvSBRQAUCFBdbmed6VM3VmeWeuLrDUWBQRQAoFiSgqUWChAAANdOfW4rV645OmcWVRTpLY6RLMs43njvKzFKJWql3emcXV3mNXrMtKzNyOeemPPrCznsCoKiKLFgusWzbF3NsK3mTKyMaEKiWwAAABCoAAUgAEioUQBUBFIAFIAohfxw+nxWWVZVFFJVVZSBVAUWlgpRQWUVValu5vOr0x0xrelwixM9OezrZc5msD1dOXXHHpV1ymd5OPD08J28HL1eTtsNSAEpZUAAWIqVQAAKgqCgBQAKgogABZRZYAABQFgoKlFgogCpQACoKB057k9Xp8fpnLt4vfx1jze3j6LeHl+jzPmef3eSd/PY307e/wAPt58rjUzJ7/J7+nOTXPpz6JJGdYxrUXKRmW5mM67XHWZ58fV5muWTXWUABSUFIamk3rPSYWriLKmdSa5zWZqSlAAKAFJAFAChAAANb56ufRrl09HK43NTnZnz76XGtyo1Euc2Q56ltJdXpnN03BNSol3ca7Zo2k1nBmud556Y8+8jGggqpRABFqEqCoWwgAAAABAABSAAIQAVAEUBFEFEAohQCD8ePp8VllWVVWVZVoFJRSUVQpZVUioFUWW6mprW5vOr0zrF6VcyZ1DHTHRdjOJEt9Pfh6McellvFnWTHLtjPTy/P+p8/r14pesEAAQAgoKgogFACliKgoAKgqCpRYWpYAqUACWoKgoKlFgqUWCoigWCpQAC3NOnfy7mfpb8vecbvj13npz265+dn0eTh38mfR59d+/u8vr588a6ejXLl6I7crx74GekOWsa56lkzWLnOmNZl7deHbWNc+jWfBPVyx24a7YXnNWVvpvOPNn08brCy26zU675bY6MtZ1lnNsmZq5RQUABZQJKABZQBZUAAAtzTfXhrWPQ577888+uOOs65s663ndTUkhrNl3rG+uLZfRkrUy0zcqjK5xda5WurGuuWdSXGbjybgxpZRSwqyKMzUzYJQAAAAAC2zLQysliwSxQgBC0ISwBYASrLIBUspLFASwBfx4+nwWWVRbZZbZVWUUlAFUC1ZVWJRRVVZbvO83XTO87u86w6JrOchZvPQsqZxLu3t35dufDWs28ksXOd5l5eP3+XXX5s3jvRKWEsAAlAKlABCoKhaCoKIAAWCpSoWgCKgoFgqFqUCKlQCpVqCpQAIqCoLYKlLcj2d/B6eeHTy3U+reXX0efwebtz493n+ml49PXm88dprpzjV6TNWzEc+e5hPP07ctSTOYbzrOV6dfPmz3vD13n055ZTfPGMdNdOPePRrO7wzw9PJrzTpmdc2F1rnU63O85mNYJLLoACpQUlEKgUiiKAFgoQAlALc1N746s6yRmZsmmsl0hCU3vnved653vjow3NsDbOtJjeebks83S3Kul5TU685MUM2pS3Ns0l1KiksiSzOggAAgAtlLqa6ZK6ZznpMXnN556zNSagIFAEgBLFCkAJQIKSxQEARfyMs+lxUKF1ZZVFpYBQKFWUtmpVWAUWVZqXW8dJre8bxq6zrLVlkLYnTO5lNVM6qTr15dc8tWW4SwZ1Ixx78nT5vn9nm79OZNwLACCgWIoBCgAABalFgqCoKIWUBRQIAAqCoKFWUBAlqCpSoKlAFgqCiFlALvmN75WPpej5frcPN6/L9TU5uuN89uXXcWXUEqpMM8evn8/Vvl25aY65s4Z687ucdc7veYW2Cs0qDfTjtn1dvH6Ly65s1jly7cOfWTW5rk61Mds6mdY6rnz59HNvi1loQ1vPSQ3WOboOboOboOTpF5rFBQFgoSKCCgqUqEsCoKlANb56ueka6Yw3mVEl3vjveekrvnlntjhrE6ZxrMrNggFAWEtzatyTTNEFKI0TKxYIWUtXWdWXtml6STUM56Z5XGd547zLJqBRIAC2AQKCCVLKAgUCEAt/Ij6PEChdWWWhbZYFWUAWlhqVbZZaBVmpVl30xvOtalzbrOszVWSli7zuZtsmWWD0dfP3zjpc6c5LARZjeWvH5Pf4uvXz53jrILAAAKAIAAAWCgWFqCgFAgC2VQgAAAACpVAqUCAFlAAKgqUAqC2IqUAWU36ManLr7/H1c+uOfCXt6Pme1fRfPvpz68d+XN7Z8fPHX1cvPW+/o8nZn13j01ynDvwmuXLeHWWVqyEoKgus2N9/NuZ9jlZycdc3TfXn1Z3bvXPm3NSalpjcjhz9PPn04zWW28U7a5bY2hnSKqCwjGd5mshogqUAqEsolQqUWCgABKlFg6dOO946yXviZ3MXC5563vjreezG/RmY6DhO2fPrk3OesKlglAAFQtslt1M2qkshmzNglWDVxbOl5XU63ldzo5tNzOcLJnluyJRFABUsoCWUQgFQoCBQJLALfyI+jwBbZVtllpVUihSgFUltWVqUqoLZqamlvTG8a1ZY1qbytazmKjW5uZSyZxy1jW+/fz9847XOpxSwSxZnWV5+H3+LfXy8u3LszK1JaIolUioEKlEogAKAAVQFAIUFlUIAAAAABaAUCAFAAAACgCKACpRZ1T0KzxzxzHXUi2+ny2PTryJPoZ8mZEje6lNdOOpPR28nSY78nOMZTW6FAApZF6dZnz3rkXMBTp14dWO3Tl06ctF7ZzneedkTnbDN58u/Ob5LlvXTjpPReVmOkyNMjSCwMS5aIWpRYKgqUWCxUAAWCoKBZUus2zpvnvtzs1NTMrnctlmjpnVy6zcl1MzcxcZ3OOuc3OWsLM6lBVstl1m2TUskzbIzUSWwUAABcjTIqFIiwAUQqKASwqIBRAKQAVASwCvyI+jxFVZVtlltlVSLYWhQi2aVVlaWLVllpZSXW8dM3Vll3vHTE1qazmNC6zc5uLDnjpnWunbj2znrvGpxoskqXOd5XHl9fC9Pn8vT5+++dN4UlikEKFBIBYAFgoBQFAohZQVZSAAAAAAFAFokWVQAAQAFAWUWIoAFlHp5d5izfDOecNdQRZVAAAAWUusJOucwqVVhKlUBrNTv6vD1xz9mc9HPln0SvNn1ZmuG9U1vG941rLriwl546c+W9XnqNZ1U4c/Tib87rluJDbA3cDd5pOjA3mCpVABKgoFgqUWCxUlQpoltZy0JVs1rOt50XtnE3OdWWypesCghExZGOOtTLOrCCqELc01BI1axOg5tyXM3mIsUSAUgsAFIKgsAAAilSAUQAQoFEAIKgX8kPo8FlVZVus6lWVaItlUFFGpqatXNupuWVpIslixdbzuXVly3149sN6msYssQyWoMzebdduXXOOm8anPQuYJUsM8u3NvxeX2+Xt1883jpmgASxFgqAAAABZQFoFlAhZSiUAAAAUBQFILAABQATQgAAAKlAhYKD0dJrPLXj7+dqou6BZQAUgAAALFAioKBYLYTW+epO3fy9pj0a57vKyzUi5WuWZr1Th1mVzM3pmJMWVq2Q2zdRNDlz9HPOuDUu5ZQAIqUAAWCpQEpCgqCgWWTepu4XTpnM1mpGeet6xqzpc3vio1KAKSzKE56JMVi5xqFaamrlV1MtJJpdFOuairIyRMWSzGpLM2RGhJagAAEKQqCwAAUAgIqwAUgAQEstA/JD6XBZZbZVtlloWiKFoVSNazqaupqau86i22MzUlyWr0zvK1c1249suuprHOTUOSLrViSxDfXluTrvGpy0hFgosnPpma8vm9vl328vPvy7MKshALBCgCAAoIWUWFoKlAhQolAAAApVCAKABLTNAoKgCAgoUgCUAqC7x2k9OM4nPOJb1qUWWAKAAAAlAFgoAgCpRZRvHWTe9axzdONZ73lreLmpeWO2JvPTA9HO7uODpyzqzGGu+/Lo9DFmejNubLDnz782+csulAAIAWCgAWChBQoKSUNdOWrnq5zWd5xM61Imta56TrrlrWNTOTreKu7irvOVTpMWLCM56SaxrVszrTcy1lJm557rml6OdN3FTbNsrKrJJbJJpBRCoKUk1CUiBQACCoCKsFIKgILAC1AEBF/KD6XnWWW2VbZZbZVWWFlUVVWW1ZrVzrOtbx0k1VlzneTNui9JvCXTNz0zuO2s6xyudROOe3HW7EWoOm+fSZ67xvPOhmWF0LJLJeXm9Xn1083D0ceu8St5zNZJLLAFlKiUiyoKgoioW2CpSpYoVYKIAAWUWVRIoKAC2WE1ABQAk1CCoFSxBLagokvr8fumMM85Mpb0qUqUqWFgoAEsAKgoAKgohZQC2D1ej5/pxy743Zjhd5aus1OmbrWeOe3NqdeKPRM7Y4+f2eedONTW9a52O2vPqTveOpnpiw5tatxrVTDpDnnplci0ACoigFGptF1WM3d1OU7Di6SXE2l5tjDUJWi6a1jOesrjOuc65rJoiN659Lnes63il65VekiypnWeOs41jjvMuc7qDVyrcyTUhbEKgCAVWrF1q45usrnOkzeU3iaQUSqgAEWwCCxLbAEKgEWwog/Kj6PnWWW2VbrOpVlVZYWVbZqaaWaVc6WWzXXn1zdVcszeSabi9M7wTSCxOu+PTOdWWZzy7c7eUuNb0zTfTj1k79OfTHIsSEXdzq5Z1kxx78nTyce3Hr05TWd5ksqSywBYWwQgqCpQCoLYlWC2UtiVYKgoFgtlgFApYFCoVSSwFAAEoksILUCCgAO/px0zwvg9PkdLYu9JZLYKlFiKlBCoKAlFgqCgWWAKEWVXTnqT1dfL1xz7OemdJUzqSu2G7nz5785ub52XpzpPNN410VSW2HTG5naWZLKFItTOOuV4zeG4LahKgoFljW8VnrrG7i6zdZ1c3cFsxN5xrMsxqZsllzJrtvz71nvefTtzSyzly68vP1iJu6wTtrh0ue28b78qTtLnPPlreMThvWImwlAAAAAJQgqU10xu46XN687JJUkxZz1zz0C6EKgEKgEtqAAhRCoBKAEPyw+j51lltmpbZWllFlltzpbqazu2Waqoaml10x0y3bcTOemSbmpdbzrMWySRmydvPtfRvl0zhjeZOPPtw3szbd9eXXLv159ccSxnMuWrvntNZ1mzPPphvycPTw6dOPPrjoxLLILIBYACCwLc0sBYKFWC2WKlUIWCoKlLc6KllWUohYNWWKlJNQllBCwAEFksoKksAFnVPdG8efxce/DXoWVbYi2CgWCokqCoKgqUWCoKlKlKiLYKCoOm+Nk79PNrOfTfPqZ73lpN75aZ7Zz03jhnvzm8NSXnz68m7vPVMuqZ5XpDOmiNGctZVcosmVnPfO7WLagoAFg3camd9ONT0OW7jTmOl5SuucSXczJbJJbItWDrvz6Z9GeRNc0mwtA124dpjrrlOvPrz5ZmumJMbsRagqCpQIAEqkKgqC3NjeuVTq5LNuZd5zFsFIKgsLRCwBCwUgsKILAAIBF/Lj6PmpZWpZq2VaBSVqVdams7tms6VZbqWXfTn1k3pvGcTpmMblXWs3KyRHO50Er0dPP2xOkiZnDvyuuCN3r38/fL0dOXXnx1LGZjWWpvnpekVjGdRrzeb1eTp1zjpnblnpz3JCxAAFMqMtQAqBYKgqUtzV0iWoKgtgqC6zY0lltlKiKC3OotgAJSAAAhLUQsKRBZR7fH9Gc5vPDGJ5zfdZRZRYigBAFgqUAAqIoAKlFlFlhYKlFgtiTVwOmuRPRrz6zPT08m2PZnHTXPLQ4cvVxz05duWpe956mNyVBRSyY1mXnm8r01MLrUi2iRYKgoWoS2DdxZNXBOk500wNslqBVSNDKwlaVaZk0MTeVzYW3I1IKgqCoKlAAAAABCoKgsAQ0gsgqALSCoABCwUgCiAAQsAhbAIr8wPoea2WatlltlWlhRVll3rOs71c6m7ZY1c1enbh6MTrvO8YzncjNpYYW4mK1c2y5uS+jydF9TnrGdc9ZOGO/Dd6+jyerLv15dOfLaGZmxYsXozWZm4a5eX0+Xp0wudmN5ri3z3kgWCpShUolCTQxUsqCgtiWoKBYlqC2C3NNaxY2llqUWItzS3I0iKQsBZQQS5tSyhBKAO3sxc8N+L1eFuVb0hQCiKgqEAWCgJQCgCKlUEoKBYigWUWCgCS3I3rnU9PXx7zn2a83Wc989c45Zc9det4W30a8tk9WvP1zjpcROjlDXHXO7kNaqCoLYKgqUqJKCoKBYLAqE1vPXMXetc+U7ZrjnrjO8dMaPReXXfLOe96zy49XLjvzzeM9BFqAAKWWFQIKBYABCoKgqAS2oKgsAAgqFqAgsKILAILBRCoLAIoAD8wPoea2WatJbRbZZaFtll1rOpq6zc60hdXNTr6OHp5uu5rniTcjM1zXPFy3vcyrdxUszLKxK9fTx+jDrJMrz1K5evy+hfT05deXLSVmZuZbMy3rcVHPfO3l5PT5OvSuetQKzz6ZrkudZqDVyNs6lWUSogqKMzcM0sqJagoAFhalFiNXNNXNl0g0iLYLc0qWKgWC3IqQsRbCkogFbT3TUx58ePvHe49e8vnOs3ec3lZZaCAAAAAKAEoFllAWVFlAhQWUAWCgCQC3NN9OCTvOI1ktWC6xtO3Xl1xjS1jnz9GF8ue3G9ILoCoKlFhKlFgqUWJKlAKgqDXTlZPTvy7Y9LnvfNnUy5TfPPTV5Wuu+DU9by9NZefty5bwNbEKgqC3IoAAAUJCiKJLKBSCwUgqCooQqCoBCoWxCoCKqCwCCoKgAIPzVl9/ntlW2WWlVZZbYXVzqW6ms7oUhNXOj0evy+vjeupvnzznfKJw15t9M4y6OlzZazKTGdY6OZOnfy7l9rlvnagvTHbN69eXXnz0GM51hrDM1vrvj0mbjWTz+P2+Tr04b46647Mazbmwxnc1OayypS2Jag0yNIKAqWTY5tZsKCiTRc2iKJYLc01c2LYl0gtgtiNIKkNM0sAlAAAAV6fN7mNXM58vN15em9u3o4ejPLyc/fyrw49nC9PNNZu6iqlgQpoy1kAAqCgqUWIthKlKlFiKCgAoAgVAAWBAUC6xU7dvL1zn09OPWcbm5OPDt572g1oACoLYihKlAFgqCiARYXSEtyOu+Fme05Q6ZyW3KujCTTJULQAAAAAAALAtzU1qazDVZ5TrF4zpi6yS6EqoABCoLBSCwBKsAgsFIKgsASqQqCoPzg93mtlltlW0WllBbqal1Zc7oJLLL059I9Xr8vr4XpvN5888N+W75+bXLvdWWt3Fzq4uLJz1z3y1rlqzpcazevfx9M79euXTnrXfh2zO286541ZWM43hrjLN9NdeXbOWdyTz+T2+Xr08WenPtjW+ejaJUoxNLMNZsAAAA1eepd2WWrZc56Q5tZsWUVVk0MrCKTLUprNjSVRYWUWCoKiKgqCoKlAKgqDX0fJ6pynn9Xiyz6PN0vT2dvJ6sc+vL0cGeXm6cr15SzWyCpRLpZvI68+jOeE3jVAqCpSoLc0qWKlFgthLYioNJSgAWIqCwAAAFlGsk9XXydcc++Mc4nNOnSwKAABZSoilQUiiKIsLAWCoKIqEqCoWhKgqCoKgsFsCoSoWm0w7Jni2XLcMVm3pvjuZ6657mbKsxjria45689byS2oABFsASrAAIBFsASqgsAQqCoLAA/PK93mVVampotllBVVqazq0mgJKubvPSX1+rz+nzumbzxnj5O3l69OS3rksllkLhLmZ1nWMaLnWsWa1Yl9Ho8Hs59O3Xl25O287xztiRjeV4Y68t9NdfP1O0jPPHn9PHW/Bz78u95tZ1i3FNs6lAk1DCywAAUhR057l6azvO40jnjtmzlaoUi0zNwyok3DKkmpSgolsoikgUAAACpQAD3a1McNfO+h890azbv0evw9c5+nrx+rXDzcPoeTO/BjWddhFtzTViXeOnI6XBO3D1Yk8xNWoqiFgoipSpSpQJKCpRZS2IqCgAAAAAAqC6yk1kAACgAUAURSFgoAQCEWoKlAAKgqCoKAAEAAAAazT1dvN3zx6F9PPOOsl44744683PpynZcrrr049M46s1m5QzjeG+c1NagVLKASwASwCksUBLABAAEqkKgAA+BV9vmlWW1WqWUUWWVvOpqqlgqFS9efbN9fp4duE1y3wy8vn7cO+7ZbEozjfO5iXWS0xOhMtWMtRc9cD6Po8Ps4dPRvHTlzKmZm5usce3PW+XXn0t62azjPLtzt8PD0+ftrOdTecNS5mol1c2WyjOdSyCwoFllBSXXXjua6XOs0ozjrDlasi0ijKiKJNDKqFEqCgok1DLUACiKItMtQnXn7JO+Z0x5+Pi7cdeii63cWTt6fFvOfq8+PTHP53Hvw69gtINXNNQl1nRdenweiY459fkoLVACliVYVSKIpJQWahQKgAAgqCoKgoAQBYKACpQAIoFlRQoglQAABAgtAqCoKgqCoigAWBYSoKgsCoXW+RO84k7uA65wWxLbc7k10z0mapnGdYlmZNbRFEoAFSwCkAQsAFgBKAEABAAKA+Gr2edVltVZSWlFmpWpqaAijOlL34+jN9PXGuCeft5bfPz3ntJrOkspc53E5XU1hbZZNUy3JctEw3K6e75/t5dPX249ePPRJmZuLqY1LrnvOrelXOM46YuvL5Pb5OuuSzpiSrIBYNJZZKrNEAUUqJRbqWXXTlvN3ZZbCTCtItMqMrAUSiKTKgtIolFFMzQigqI0Iok1CfQ8Pvc8azcY8M1N94ollLc5XrvgksS2wqAA1c6hrFNZ0l7eZECqgtlLZqFIUBYFTLQlBZQUioiwSyhCgAohYKAUgQAUlAUAWUUkAAAqCwAJLFCgAhYKAAEAAAFIUiiAAAAsAB057Tr05bxjbMsc98msxNbIUKASiLBKIBKIsAVLKAiwAiwAiygAPiq9nnVZaVZVgFtVWprOiiKJVNenz+rGutjlOfl9Hl1cSzpjNizaWapqXGO2bnGmiNJY3Tm6Q5zpmzHflY+l28Ps4a6WXPOcu3K6xcLprOq66zrOM46YXh5PZ5um/NN564kssk1ElChQJaMqBSAUXWs6zq0l1rFjVlIsFlRLCSgAAAAUlAolIi0iiUCpYoi0ezlpxvD0eaXE6W9OLpDE3a5t4WLKAgE0JVBZQBTM1CTUqULZYtWFJCiUFaiNDM0MqAFgAhALQFWSAWClJbAsAFhKWIoELc00lkAWCoKgAAkS2oKgqCoKCoLAAWCoLZ0kxetmeLrmubeVystIWoKgAusE63lZOs5jeJFItqCwAAAEAKQABAACChAFAixAqWD5FPXwpZSlKgUVZpvOpVVYqJVrfr83q5WzfPDh5+/DozNZ3jM1LnVm5u1rNjaOV3LC2WaVZNyMZ6Szk0s17vn+7GvTc6487jpk8s6cunRvlo7749M51LJOfn9PLW/Fy9XDtOazWZKslqDRYqIoy1Ki0zdJc21ZpYWWVYNXNNIigAgCCoLAoAFBQFiVSKIoLIFBT0TeHC8emJ07bnWTnx9+U8F9PG64ce3LW8qtgIsKUKliiKJQSiTUM0pVi1ZFWFtM3WpMXVkzaMzUMzUtiiLBKMzUtgFUUiKJVJ25eiZuPTc8/Hn1crvg6y3mstAAWAC3NihKgqCoKgsRUKWAAAACoKgqACpTp25d8c9ampzjVs58/RmXxY9Xm12yjWgAACCoNMioKgqCoKgqCoBCoLChCoACAACACoBKIo+TV9XAVRVlIULZqaampqqljRMaU7enj35W8+nPM83Dtz6zE3nWczSydM6mt6zvOltjM6QxQVZS0znpE5TrmzPp4dpfXvHTjgpOHH0cNb5tZ1rfTjuTtM6zJnSuHD2ctXxY9XLpOTazDQzaIoijLQlVRTKltllLSLYzQJS2VCyWTUsilgBUAFAKIWUWJaQtlAFlhW07RXDhJl39OvMT2dfm95np5dcm2a1ZLKiwAtlUogAColUk1DM1Kamo1brMlujOrZJbZI0TLQxNRcNLczUJKWSqk2MNjLQy1Yy0MtDPfl0mfV05dZwmOt3PJj1cc9PPjrzvXKlgAEohK1c2KlLBLAqQsRalAAAAAAAAAAOno8nSZ9d89zz9N8/VjcZjHl7+bXXI1sFSwCgCAAAAAAAUikilhCoACCoLAChAAgsEEoD5lX08YtWKBVCLZWrvOs3SpqUJWk9Hfl25Jy7cZPLnU6MZ3NZzNDNo3vn0zres7zUpObUqaJdVYTUMZ3mydMbPV05deWdQkxx7cta5zU1rNZrpvjvLdzqRNE48fVz1ryTvz3MNqxOsOc3DKqi0y2jLUJNFmlFtly0MzUSW0i2JNFw0rLQzN5TJKtzS2IoKgtgpZUoAoktlHbj6Wc6zc8/KrXZNQlCSlk1DM3KzNKzQalgVYolqJaI0jM3LMTSs9J0htvMltklqRVSKIsJneViy2TUMqMtFltTLaMOgw2TDcXM2MWq69eGpjvvzauPRw7c083LrznfMrVysUAFksFgtzTSEsAlIsUBZUAFJVIqSKMtS2LAABYLcpNXI6uUTUhQtAgAEsACLQQAQoBoa6dc5899FmfNn1818s6ct6BSCoSlItM3fSOT16mfBPVzt87eNVACgPnVfRxi1c2iKUqFVbZqa1Zc6KSbmj0defTlHHrwjzyusk0MNwy2MdIOm+e83UliSylg1rOpSyMyypvGk9Pbz9+edCTPLtytxnU1rON5rKK7749Mt1c5nPrm3jz75t4OmNJNSsNSsTYltMtDM0MtDNupZaJNDLViW0y0MtSMzeaiykDM3DE1LJZSpVWUWC2IqUWDVzYtzYvr4d3PGd8pOay9SwAAkogtk0MKqUKtiauoxd2TF2Obqjk6Suc60571YmmplVSVqSKIsIFk1CSrZKICUGpolWSKJQjUIoijKlyua9V4bzjnz6Zu8TctxOmbcTcXLQysqBVBRAhNQiygAVZZGpRYSgASok1KysUAAAAEAASqgVLABKIAS0AEAvfh6czt0z058ZS5zz6cpvz8evHr1ItAAvXl7JnPT09Jy8nbpq4zOmbnhz7549PF5foeLp25jdEoDw1e/EpYoipS1ZalpVupc1VG87jvvG+cnD0cDzU6ZstU1rN5t5rOemLLvnuNFlSjCyy7xqXaajOd5Mlrt383oxN0xmc+vO3lLnWpnWNM5rU3049M3r049MzQkxneLcY6ZtxNzTE0MtKzpYk0MNSpbYmliNQiwVolWJNjDUM53LcTUrKwAzNSsLLLc0qUCKhbYKg1cjVzY9O9Zzxvn9HlaC9FliLAUk1KgEoy1KzbRubyW2SaWBUiiTQzaItJVkULYS2BKMrBBUsAIpc1RVRVkiiKIoiiKMtQznpLc6moy0MNqxOkOWeubrDUXM3DDasNwzaMqAJNQiliwVSiSpQUlAADM1DKqgAAAAAEogAWLSLBKIsqTUIKAvbhqT29PFrGPVPLk9PHjnWrk1pKqKSUi/Q+d68T378hw73z7jrMZjpMs3Hj9nk308xOuwArxVe3FqVSpctCalaKlULrO5VWG8bjvrOucnD0cLOBdxVXWpvFznpleed51OXTGtZ6WXNUiZ0rNg3rGos0lxdQvfl1zOtlzmY6YOGd897mLnUhNL057jrc3DqxqLjUOc1mpNSs53mpSggCKpWoltiTUMtRWlQtgok0Oc3lcZ6ZrE1NWSjM1EzNSooigAABQtllWVPY1nHG+Xv570obtlRNQlok1FkoiiKJbSbmpLZZKUFkLTLQk0M2wUCyRQoSwJLFEUAKSwWVaWZWUKQAABKIok1FzVBSURKMZ3GsTZcNysNjE3Fyoy1Ky1Fk1DLUM0talkKJQokAAAk1KgWSwCgAAAEoiwUCogqLABKMqtkoihYSwIpZKqKSKIolgtyPZ38Xbln0c88U7vHNX0+fOdVLNVKIE8he/JqWFVYqWVVUlVZWllWialjtc6xHLpzOKzc1c7lvTO81ncjlnpnU43TWbqallqJNQxNyyazV6XOsih25dMums6zlnUOHLrx3rOdZ2lWyaWNbxvNVCpBmjJKRKENSCoLZS2WNXNiwEotUVZAEsJLFzN5txjpjTKiTUMzUoojQzNQyssWVVlgC7z6JO0XHHnw78r1jRqWgoijKwksFFUCkamotWSW1JahRCgpMzRc0UEWCgEEZWyStMl0iS2BZS2EtiNCwAAQqWAEoigAACKJNDLUWTUMzctxNFyozNS3KwgtkoWUohZUUCiKIozNZIsVLKgAACwLAABQAiiLAAokqszUIqooi2MtDLQy0MtDLQw3Kw1BrBNzNVLBLLEoiiSq8dO3C2Vbqallqay1CWVbrOpdVc2tJc6aN23Exx7caxNXTHTOpd7z0wTUTnjpy0zLnU1rGjdzcqUmdw5tLGpqWqibxo76zrGU1E4+f1ebe+c1nctlLYjWsU2zYsCEVjeazNSopIoigUWWW2WALZS1ZBCoKhQJnWTON51c0qEAFajN0XE3kxnedZlUFFWV25emZbzrPPip1jUMtQWULCTWVyqpVIqFlLZqS6zpLZqQoUQABKMzWVWCxDTIskWxBC1ZQIqC3NTSUtzU1YkoCARag0hKlAABSUBSAiiSjKxZNFw0rE3lcNSszUWAApSam0mt6zOTqTk65Oc3m3M1Fk0rM3lcioACwLAAApSKiCgCiKiSqyoiiKJQFJVIoijNsIozNSsKqKJKICLKASjyDvwali6mpqrqXLomuM65qaljWpqatlhvO42rEzx78beda1c22NamsqqTny7c9OWdZ3nVzTdzqXVmsotOeeuTOs2t6xrJaOm+fXObKmefm9XDW/PneehRKBRbYjSIZ1mhKiwiwqUAKJVFIoFItlEQIttyjSBEqZsqAiiW1VaiNIxOma5Teay0sloKh6fP6pmalzjjZb1oiSiErUISwiy0EIW2VLrNjWpZNWVLZZAABCwJLFRKskXUyKktoCoFRKJKWVC3I3cVNsE3edjbFNSCoLZS2JKgoFlpSQACLBLFSiKWSqzNQzNxcZ3LczcMzUtllNdcd85umpzzNxMZ3hrnneLuKqKMzUXE3KystAAQAFgtlgACVpF6WTjnrhczWbYKFJRColUlCKJVJKJNQmdS3KqiwkqosIoikko8krvwWaW6zqXe8dM60tzrE6ReU65qampVWHTHSNLcZxy7crcLNVqWXes6zNSpMc+vPV48+vPeZZbnVzZem+e83dzZUsMqq1YtzqNdMbznQZzx78rrzY68+llWwIoLKEpZNQiwTUMzUqUQClFllKFWJVAkkubUS2oKgRBCwlFVVWLZrJQmdQxnc0wqlWIonq83pmLLM546zb1tySwJLLQACAlKAC6zY3rnqTpcWTVyTVyNRCwBFskES1EES22UtmoKkgEqoFSwkua0yNM0tyN3GpLc0oi2E0g0JKBYKABUAEAABLCLFhKkpcrLZNQyDr28/XOeuuaZ6TKxm4aznS6i0zNQksWSqzncrKwiiKqKIoWWBSKHbj3k61rPPny9OF8uO/HXTKyhSUBRZYKIoAiwgqZ1DKyijKqyoijKiTUryTU7cFlLZZddeO5rvrn0zuyss53ms21VaHTHSTRc5zz65XnOkXk6FaXNtWZxy7c7ePLtz6TCtZlDXTlrN63FzrWUq3I6XNy1ZTW+XTM3ZZiY6Yt4cu/LdwrSKFlAhKCiASjKqysIqrViW2IoUgFJSSjOd5qCksIQSqWWFaJqalVYCEsrM1KzNSpVAi+jl1nNjpzkxZb0KJNQzNQystqBLBYNIKCiLrNTdxY0iNXJNIKESxZLkgtiwilWaGpZAIsAEsVEpmyoKoilhQtlktAsRYLc2NISkNM0qCoKgoAAEBEVLBLLYCSlzKprA6a5WTs5ak3M0oLASwk0txNRZLKmdSosAoAAItgq2JuWTtvz2Z75wScd4u5K1YBZQJKUAAoiSqgWZ1KyqyKWTUSKWKJNQyqzxzU7cZSy2WVrNXp046mvQ5bzqgFRqas1vG01VkmdwzbYxOjOsXVxcNJcc+uF48u3HpMWN5ogg6XCa2zS2WW6zqXWs3K6xTtc6zi5o5cu/HVxNTaAAAoAEUAk1DLUsiltli6moioiwiqgEsWZ1myIoQSwFBS2WLVlUKSEqpLCTUqLADtvNzz1x6l5a6Lc6urOePTTyZ9uF8jtymsyyoABYLYLZYqDVzY1c00iTSUqAQZsEstAAWWLZQACASwkstksqCrZqFWSVqJQokoCiNEiiKIAhagqDVyTUkNMis1bASiEEstSjKlw1KlC6zqS2WSlIogEozLLcrCSy2CgIpIpYoVYtakKSKhKMZ3LcLKSqJQIoLZYAAgIKksqAAEqoLAASjxyu/GKSVSW0VS6lXdxotlq6zpNb56s6a5U6XFjVllKxYsxqKxc46ReHL0408mfRz1OdKKCpZVLSatli3Bdso79OHXM2ymZy6c9XmZ0sSypSpSpRAWUCEqooiwqU1rOoFiAiliwksrM1mszUsiiKIoFVqWLZYogoixYqszWk5u2q49e3k1npjzyXu52a66x11msmd3Ns3rFTpM7jxY+l87PTMpqWUAAWWKlS3NNXNiiLc0oEBAQoJShZS3OoAiwSyksGdZqSyi0WsqoVZFVJNDNCqgoixJNZVC0gIFyrTKNJC3NLZQAQEAVLBCoAC2Uus6kpZIogILZNQznWbZLKgoAABZqFWLqWRQiiKJnUM53msrLZSwWFlAioKgAksqC0EQAIsCiUAPGrvxi1ItqW2xbSW2pasUq2DViNXNNXNN652XreWsa3I56qXNS2zGeiuGPTiXyZ9WF4TvF5OgxrWlzrWpMTqjjntDjOuLb15dJeiXEzjpmuE3OkxNxM20i0i0y0MqCoi1ctDLUM0LrNNpciwSiSy2KMzUrM3Ew0rDUIoW0mllaWI0jLUMrazu87OuOWbd9fN6Kz5tY1BZrTWpN7LiBWsk6XGk3c7S+f0cs68k1JvNKAWWABRZS3Ni2ItzSgEAIolAUihYjSUASwkstksqFFWGlkAWU1ZqSKSTRZRAAJLFzLLSBAyKWC3NLYjSUsABALBLBLLYoAtlktlNXNkqUkok1CTWbZnWTM1NWLAEAihZpWpqS0gtkiiTQzNSs51lcyzQAUAAsAQqCwIKEBSKIABZRKPI07+eLSW2pbbJpbJaoqwAWVZS2C2Jayl1cTOumuVzrtrlqTprGtTUtTE3M3njrnN5Z65msNqzq0mmklUxnpI5Z65l56VrWs2RneTnnpNTm2rF1Uw2XF0MtEy0M22JbYzdFw6Q5OsObZcXUiKJKXKqiiTUIoy0MTcrFoVYVS2WKWI1irjGd25GoQvSauOOfRDjrpQmk6SkzNCWiUTW+ezvz2zPn53l1ysQChRUBVlFlilJSFlAgCKoWIogAFgpCxBEpCmpoVclBZYFLqVmljKiKEogJLLcyxYsqSjIoACpSojTNKlFgsCAgoVSpFCliVUWUCIsJLKk1LczUMqrLQyqsqFljWs6i2akCCiFJnUrOdZtxNTSVQtiKJNDKwiyoEgAoAAABKAAODTv582qlUWWlEtiqEAqVVlFgsSWyJbIzdaxpd6xqzesW56a5aXpMsWxJZNSMkWsjpedOjFKkhElhF1co3IJK1IpCiWojQy0rLQlolqItMtDLQw3Iw2Xm2jm2XE6DlOsXnNxcqqKiTUqNDOlgqALuQxyud7SwSqzb3ZNZYkuVRB15egs2uMmZdsDbO0zdDp049ZPn46c51goBZQIUAKUWWAKFCAKEASwBQLAIpAgAsalltWCpALZS2WS2AAACAksXMspLKksWLLCllAAABSFgsoiiLSWpJaIsFlKWIolQsBLKKMzUMzeaiiTUJNS2VRqWTVlhZYBAJLm2ZsrMtqWpVEAAk1CSypLKSwBAAAABKWUCOaz0ecUilAosoAKlFlABFsSVDNWUus6NazrUtizTKNsF6TCN5zmXUzmXTI252Xd5jreSXpMQ2wN3mOjA2wOjnU3eY6XmOl5U6XkOrmOl51N3nTbI0g0goKITQy0XDSMqjOeiXlnvF4OuV5tSoolUogRdcbnWpLLQRrWmUkQhRCy90dGbi4RSUjVjGtC756TpqdJPn8u3KdYLEoAFAFBZZVACoKBZYASwAAASwSqiwAShZS6zY0IUFWFlQAQqUAEEFkSkSksJSgBYiiKACiUFWIoltIqCwiwgq2WAAAAAEoyqsqJKJKqFFljVzS2WQBEELcyqi0ltjLQzNQiygJnUrMqyASiKIoiwABAAXMrvwiiKJQKJQAAqColsBLIKFUamqalsCgAESGbJZLJUJQlWCoKAAFFAARYKlFgqUqDSDTNLcjbI3cE3cDpedOl52N3FNJUjRczaMzojnnsl8+PVF8s9OLeV6WObpJcc+uLeUs1pKJvPdmZ1LmTUXKwlehJphm5RSFsBYN75aTpLUvo8/eT5/PtynSSqiwKBSVYigCgKllAUFIoiwAABEpcrESqiiKIotzZdXNk1c2LZQgqCoKCkEsJLmkKQIoiiUACllAqI0TNoKAilIoSwAiwWUsoiwKIoiiLCKJNQk1KiwilBKlKlioCiTQy2MtUy0MtQk1DM1KgMzWaksqKsiiW2XLQy0MzcMNSyKSUXCuvGKJQAKqLIBYoCAACgtqW2yWqUQoKIsJmyWS5zpCWKWUgAoiiKAACiKJQAAWUAAoFlAKlFgtzUtzTVxTeudOl506XGktlgCTUlzncl457crprlK7YwjOOuGsnWtXWWMhZAh1LphlEVLFAAAWDeudTr6vB6JOfm9/gmoqooFIoABbKAigFJQWUCAAAIqoCAiiKIAolBYNXKNs0qItlCgqQoypcTUrLUrLQyoy0rNAAWFUltiLTNqJNDM0qFIAAACUKQsBYKIFSCopZNQiwgqLAUUgUlUKkKI1AokoiwSjOdS2SysyyySqihVJbZYqIok0rE3lMzUslDCzryKIolAACKllKKIolpJapVsltIqigoLCZ1mJLnOpLJYqWKACliiKgAUiiKIoiiUAABQABQAFAAKlFhLYNXI3rnTrrlTqzqQok0lznpJfPy9fJrztZ1RpHVGZEWSxUvQm2WWbFixQEolACUAHTnqPV5O1k8g0FWKIoCBSKIolBZQJaCgAFIsEsEsQKiiLAAoiiKJQqWKVVWKWQUiiSiTUMzebYokokqosQBVlVRZZFAAok0MqJNQiiSlgogsBYKCpZAAAAJLKSlgBUWClFlipSiCiKIok1KkoznUrOdZqSyxKJVFWVRQIoAk1ExN5siq5q6coolAUkoigolojSo0M2kltqValEKCgUkuZZLmWSzOoJQCiKIoAFIoiligAAEKIoiiKJQAFIoACBSUoIWWliLZS3NN6507a5bk0UioznbN8/n9vJvz9jeUsrM1DJtWkSSyVLACKIoiiKWLAolU16PP0mfPn3eJYqooAKIoiiKIoCVQKAFlgAQSykpIsAUAAoikiiKJQtzpbrOsqBZQISiKJnUrKwSqgIKlC2WKWFlABRSE1EixUoiwk1KySgEBZRYKAIWCpDUBLKAAFEoFhZRQtJKAACSwRLZm5qSyyKqAWUtlloiKAFIksqZ1LIquaunKLTNoiiTQzaSW2otqLTLQiiVbJVIoAUBBmyambM2SpYqIolFKIoiiKIoKIoiiKIoiiKIolAAoiiKJQAAFIoAUALYjSUusU7b49JNWVIqMtJeXL0Y1eM0rLcMW5VBYsAAAAIoiiKiKJVG81PTzz6E+e9HBqKIoiiKIoiiKBSUCpYolEAAiwSqiiAlAoiiKAIoiiali6zqWiBQAoSkysXKyosIqoCURZVtliiAFUWVBBLFEAEsMzWbAoAABYKgAAAAAAogpRRSFC2VBYgAqSwksXOdZ1MrLCwAWUtllogVYolCSyyTQyqsK68YtMtDNoy0IqigqyUABSUCiKBSLBLJZmzNkslSpSiKIoigVYoiiKIoiiKAAAABSKIpIoiligAAoiiKABSUBRZYWDWsU7b4dE2JARKXly9HFrELYCKIAUiwAAAKJKJQKFlL051PTwdpPE9XmagBSLAAAFKJQFIoioAAgpKIsAACiKIoAASiULrOopZSgVIogJLFkpIKiwAgqiLZYoVQUSiEsEstgARLCSyosoUlIAAAiygAQAVZSFBSBRZSgogCoQRUSmbCSzUkoirIpYEtlltllFJSEsEsqKIqzDTtyiiKIoiiVUlKAFIUlAUiiUCiSyVmyWSzNiiKWVYiiKIoiiKIoABQCiKIoiiKIoikiiKJQAAFIoiiKUAApAVZUBaC7xZO2uXRKECJjpma8+e3K6gqKIoiwKIoiwKIoiiKIoBKlLc1e85dpnyN5alACLTLQiliiKTNAAAACKqKIsAACiKIolBKiLKWUalzbZoWWAAECSykCKIBLKSrAi2WWgqUqWKgsCAgoBLCLEgoAAAAACLKBAFJVgoihaBYNJYqCpUEEsVLKksSCossSiKIolBYjSValhASqihKIO3EoiwKIoiqAKIUiiUCgAUiyJLFkszYslFIpYpIpZQFiKqKIoioiiKIoiiKAAAAAACiKIoiiKIolAAAUlAAUAtg1rFO159JARLJc8u2JrjNTVikiiKIoiiKIoiiKIoiiUAALc1d8umIiiUCiKJRQIpMqMqsigCKIoiiASiUACwKIoiiAFLZZVJaCoLAQISwACASqikilCLYKlVYLc2KgAiiLALJKIogAQKAiiKIsABSKAgpQFlAFhbZYFRKIsJKMrKk1EiygAIoiywBYjSVSpYoiiLEDvyKIoiiKJQAAFIoKJQALISxZLJUsiKllAAoiiKIoiliiKIolAAAIAKIoiiKIWosgAAoiiKJQAAAAAKABQC2Uu+ejqzqQImdZXnz7c7rIQsACiLAAoiiKIoiiKIBRQLmiKBSUgoiiLBKJKILIoAAiiKIsAAoIKIoiiLABQUloWhAAIsJKqBAAAIoigVZSCiKIUAWABAAiiKIqoEAAiiLAAABQAAKUIKIUWUWCoLAQIsIssixAIoiqiiKIUlIoUAAArryiiKIoigAoiiKBSUAAAJLFkrNglAAFIoillAAAAAAAAAIAAAAACgAACiKiKIoiiKIoAAKJQAUFlFlNb56TaISyXOOmLeaqiiKIoiiKIoiiKIoiiKIAAFFkhQUFIqIpYogqLCLEgoEKWKIAAEABQAAAABYWVVIFIoiiSqkokpBSKWKIoiiVSVSKiLTLUIoiwiygAAAEoixIoiygQAAAAUipQBQAVYUlECUAESrYsSSiCxKIoiiKIsAAKAqWKqBNDpzAAAAKIoiiUCgAABLCLJZKlglKIoiiUAUoiiKIoiiKIoiiKIoiiKIoiiKIoiiBBSKIUiiKJRQAgKFIqAAFAEULYN3NiywmdRcZ3mooiiKIoiwKIoiiKIoiiLAFFIoigIpQUiiTUIoysIsqKSKIoiiLBKIoiiKIoiiKIoiiVRSWlIolBKJLCKIoiiKIolAoKIoKgokogqKJKIogAAAIokqopIsAABSKIolAAAWAAVQAAiwASwSywACKIoiiKIogQpQACiq6c4sAACiKIolAUlAAACBZKiSpYqIpYoAKIolFCAqKIoiiKSKIoiiKJRQEpIoiiKIoiiKIoiiKAAAAACiUAAFACiLrNKBLJc53msqIoiiKIoiiKIoiiKIogACiFIolClhZQBKJNRZNQkqyKIoiiSiKIogAAAAABSKIoWUUlAAAiyyKIoiiKIoFUWJQFJQKJKJKIsCwSiLAKSiKSKIsIoiiKItIoiiKIogAAAFULYy1FjQw1EiyoCKIEFIpYok0TKiKqKIoioAUWq6c4oiiKIoiiKBSKAAAEoksliogUIFIpYolAAoiliiKIEAAiiKIolAAAABKIoiiKIolAAAAAAAoiiKJQAFAFlFlipRKJnUXKwCgQFSkigAIiqiiKWAFJVjIQBZVWUWUCAAIsqKIABKIogEpIqosAAACiKiKBVigAAoiwAiiKJQAAFBQIFAAAIsIsoBKIsACiKIokoiiKIolACKIoiiLEAAVVlUtaiTZMtDPPrhcSykpIqooFiKWKIoikyoiqiiKIBQqtYiiKIpZSgAgpJSggACLFiwSpYoioigAUiliiKJQSiKIsAAAAAAAAABSABAAABSKIoiiKWKIoiiKIolAAolABQWWAEsJNZWKslCKIoiiKEoiiKIsAAFC46YJQFAgpQAAAIoiwAKIsIpIKiiKIoiiKIoAAKJSCliiKIogRKJQBQACgAUACKCLBKqASiLAAoFIoijKiKIoiiKIoiiBAIogooUlUNXKNSRNsi4sWSrMqqKBSUgoiiKIpZKSCgIoiiKKrWYoiiUAABSKJRAAEpYCLBKiKWUgoiiKIoiliiKIoiiKIoiiKIoiiKIoiiKIoikiiKIoiiKIoiiKIoiiKIoillEABSkilBAVQKiAk1KyoiiKIoiiKIoiiKIoiiKIoSwBBVlBSAAAAEsAoAACKIsAEoiiKACiKIoiiUAAAAEoiiKIoigAAWACiUAEpYAEgpKIoUgpYoiiKIpMqIoiiKIoiiCkoiiUFIKWKIoiiSiSrIEFWKBSUgAACSqiwAAiklDQ1AAAAABSKJRAAIsVKIsgFFIWIoiiKAAAAIpYoiiKIpIoiiKIoiiKIoiiKIoiiKIoiiKIoiiKIoiiUAAAABSKJQAAoVKJKIsQAAAAAAACUAIpYoikiiKJQBSiKIoiwAAAASiKIoikiiKIoiliiKIoikAABQAEoiiKIoiiKIoFJSCiKIsEogoBKIolBQFiUAAAEoiiKJKIqooiwAAKJSFACKIsIspKIpIolFKIoiiKIokoikiiLBKANDUAAAAAAFIoiiKICKIqIVYoiiKiKIoiiUAAAEoiiKIoiiKIoiiKIoiiKIoiiKIoiiKIoiiKIoiiKIolAAAAAAoigBZRKWAixAAAAAAIolAABKJQiiKIoigAAAAAAAAACKIoiiKIoiiKAAAAAAAAAAJQiiKIoigApRSKIqIspKIsAQAAVZQFIoiolAACKqKIokoiiKSKIpZQKIoioiiSqiwSkiiKJQFWKIoiiLAEiiKIoiiKLK1JQAAAAAFIoiiLACKiKIoiligAAIAAAASiKqKIoiiKIoiiKIolAIACpQAAAAAACAAAAAAAAAAAAAFAACLAAAAAAAAAACKIoiiKIoiiKIoiiUEoigAACKIoiiKIoiiKJQAAASiKIoiiKJQiiKIoiiKIoAUBViiKIogSLAAAABQAKWKAQAFiiKIsQCLAoiiUAAAAAIsAIoiiKAAAAAAIoiiKIoiqhSyrAAAAAAgAAABKIoiiAAAFIoiiKIoiiKIoiiKIoiiKIoiiKIoiiKIsCwAKIUiiKIoiiKIoiiKIoiiKIoiiKIoiiUUAIKIogqKIoiiKIoikiliiKIAsAQAAAAAUiiKIoiiKIsAABSLAAoiiKIoiiKIoiiKIpYqIqyKIoiiKIoiiKJSUUAAAASiAiiKIoigBZQAAAAAABKIAAAAUlCKIogAEoiqikiiKWKSKIqWKsgAAAAAAAKoiiKIoiiUAAAAEoiiKIsAAAAAAAAAAAAAAAAAAAACwAAAAAAAFIUiwKIoiiKIoiiKIoiiKIoiiKIoigJQEqopIoiiKIoiiKIogAAAAAAAAAACiKIsCwAAAAAAAFIoiiKIohSKIoiiKIsAAAAAAACgJQAAAAEqosQoiiKIoigJQAAAAAAEqopJQCUAAAACKsiiLAAUiiAFIsAAAAAAAAAKoiiKIoiiKIoiiKIoiiKIogAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACiKIoiiKIoiiKIoiiKIoiiKIohSAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAKIolACKIoiwAAAFIoiiKIsBSKIoiiKIoiiAKIoiiKIoiiKIogAACiKIoiiKIAAAAAAAACgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFIoiiKIsAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABSKIoiwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAoAAAAAAAAAAAAAAAAAAAAAAAAAAAA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) top left no-repeat; + background-size: cover; +} +a { + font-weight: bold; +} +h3, +h4 { + color: #5a6876; + text-align: left; + background: -webkit-gradient(linear,left top,left bottom,from(#42505d),to(#72808e)); + -webkit-background-clip: text; + -webkit-text-fill-color: transparent; +} +h3 { + padding: 0px; + margin: 0px 0px 20px 0px; + font-size: 18px; +} +h4 { + padding: 0px 0px 20px 0px; + margin: 0px; +} +hr { + border: 0; + border-top: 1px solid rgba(0,0,0,0.1); + border-bottom: 1px solid rgba(250,250,250,0.1); + width: 90%; + margin: 0 auto; + clear: both; + margin-top: 20px; +} +.breadcrumb { + margin-top: 0; + background-color: transparent; + padding: 0 15px; +} +.breadcrumb > li > .divider { + color: inherit; +} +.breadcrumb > .active { + color: inherit; +} +textarea:focus, +input[type="text"]:focus, +input[type="password"]:focus, +input[type="datetime"]:focus, +input[type="datetime-local"]:focus, +input[type="date"]:focus, +input[type="month"]:focus, +input[type="time"]:focus, +input[type="week"]:focus, +input[type="number"]:focus, +input[type="email"]:focus, +input[type="url"]:focus, +input[type="search"]:focus, +input[type="tel"]:focus, +input[type="color"]:focus, +.uneditable-input:focus { + border-color: #E9730F; + -webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px #E9730F; + box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px #E9730F; +} +label { + font-weight: bold; +} +label.checkbox { + font-weight: normal; +} +.form-search { + margin-bottom: 0; +} +.form-search .control-group { + margin-bottom: 0px; +} +.form-search .search-query { + outline: none; +} +.form-search .search-query:focus { + box-shadow: none; +} +.input-append.input-block-level .add-on img { + max-height: 16px; +} +.label-help-block, +.help-block { + color: #8c8c8c; + display: block; + font-size: 80%; + font-style: italic; + line-height: 130%; + font-weight: normal; +} +.form-horizontal input + .help-block, +.form-horizontal select + .help-block, +.form-horizontal textarea + .help-block, +.form-horizontal .uneditable-input + .help-block, +.form-horizontal .input-prepend + .help-block, +.form-horizontal .input-append + .help-block +.help-block, +.form-horizontal .help-block { + margin-top: 0px; +} +.input-append.input-block-level, +.input-prepend.input-block-level { + display: table; +} +.input-append.input-block-level .add-on, +.input-prepend.input-block-level .add-on { + display: table-cell; + width: 1%; +} +.input-append.input-block-level > input, +.input-prepend.input-block-level > input { + box-sizing: border-box; + display: table; + min-height: inherit; + width: 100%; +} +.input-append.input-block-level > input { + border-right: 0; +} +.input-prepend.input-block-level > input { + border-left: 0; +} +.input-append button.add-on { + height: auto; +} +.input-append th a { + color: inherit; +} +.input-append td { + vertical-align: middle; +} +.input-append td img { + border: 2px solid white; + border-radius: 4px 4px 4px 4px; + box-shadow: 0 1px 2px rgba(0,0,0,0.1); +} +.input-append td.actions { + text-align: right; +} +.datepicker { + top: 0; + left: 0; + padding: 4px; + margin-top: 1px; +} +.datepicker:before { + content: ''; + display: inline-block; + border-left: 7px solid transparent; + border-right: 7px solid transparent; + border-bottom: 7px solid #ccc; + border-bottom-color: rgba(0,0,0,0.2); + position: absolute; + top: -7px; + left: 6px; +} +.datepicker:after { + content: ''; + display: inline-block; + border-left: 6px solid transparent; + border-right: 6px solid transparent; + border-bottom: 6px solid #FFF; + position: absolute; + top: -6px; + left: 7px; +} +.datepicker >div { + display: none; +} +.datepicker table { + width: 100%; + margin: 0; +} +.datepicker td, +.datepicker th { + text-align: center; + width: 20px; + height: 20px; +} +.datepicker td.day:hover { + background: #eeeeee; + cursor: pointer; +} +.datepicker td.day.disabled { + color: #eeeeee; +} +.datepicker td.old, +.datepicker td.new { + color: #999999; +} +.datepicker td.active, +.datepicker td.active:hover { + background-image: -webkit-gradient(linear,left 0%,left 100%,from(#f39922),to(#e3530b)); + background-image: -webkit-linear-gradient(top,#f39922,0%,#e3530b,100%); + background-image: -moz-linear-gradient(top,#f39922 0%,#e3530b 100%); + background-image: linear-gradient(to bottom,#f39922 0%,#e3530b 100%); + background-repeat: repeat-x; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff39922', endColorstr='#ffe3530b', GradientType=0); + color: #fff; + text-shadow: 0 -1px 0 rgba(0,0,0,0.25); +} +.datepicker td span { + display: block; + width: 47px; + height: 54px; + line-height: 54px; + float: left; + margin: 2px; + cursor: pointer; +} +.datepicker td span:hover { + background: #eeeeee; +} +.datepicker td span.active { + background-image: -webkit-gradient(linear,left 0%,left 100%,from(#f39922),to(#e3530b)); + background-image: -webkit-linear-gradient(top,#f39922,0%,#e3530b,100%); + background-image: -moz-linear-gradient(top,#f39922 0%,#e3530b 100%); + background-image: linear-gradient(to bottom,#f39922 0%,#e3530b 100%); + background-repeat: repeat-x; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff39922', endColorstr='#ffe3530b', GradientType=0); + color: #fff; + text-shadow: 0 -1px 0 rgba(0,0,0,0.25); +} +.datepicker td span.old { + color: #999999; +} +.datepicker th.switch { + width: 145px; +} +.datepicker th.next, +.datepicker th.prev { + font-size: 19.5px; +} +.datepicker thead tr:first-child th { + cursor: pointer; +} +.datepicker thead tr:first-child th:hover { + background: #eeeeee; +} +.input-append.date span.add-on span, +.input-prepend.date span.add-on span { + display: block; + cursor: pointer; +} +.modal form { + margin-bottom: 0; +} +.modal-body { + max-height: none; +} +tfoot .pagination { + margin: 0; +} +.table-condensed tfoot > tr > th, +.table-condensed tfoot > tr > td { + padding: 20px 5px 5px; +} +.table-striped caption { + text-align: left; + color: #5A6876; + text-transform: uppercase; + font-weight: bold; + padding-bottom: 0.5em; + border-bottom: 2px solid #A5CED8; + line-height: 30px; +} +.table-striped caption .action-btn { + display: block; + float: right; + margin-left: 10px; + text-transform: none; +} +.table-striped td.object-title, +.table-striped th.object-title { + text-align: left; +} +.table-striped td.message { + padding: 20px 20px 0 20px; +} +.menu-list-table .table-striped td, +.menu-list-table .table-striped th { + text-align: left; +} +.menu-list-table .table-striped td:nth-child(2) { + text-align: right; +} +.menu-list-table .table-striped caption { + background-color: #FFFFFF; + border-bottom: 2px solid #A5CED8; + color: #5A6876; + font-weight: bold; + line-height: 30px; + text-align: left; + text-transform: uppercase; +} +.table-left-aligned th, +.table-left-aligned td { + text-align: left; +} +.table-left-aligned th.text-center, +.table-left-aligned td.text-center { + text-align: center; +} +.table-left-aligned th.text-right, +.table-left-aligned td.text-right { + text-align: right; +} +.table-left-aligned select, +.table-left-aligned textarea, +.table-left-aligned input[type="text"], +.table-left-aligned input[type="password"], +.table-left-aligned input[type="datetime"], +.table-left-aligned input[type="datetime-local"], +.table-left-aligned input[type="date"], +.table-left-aligned input[type="month"], +.table-left-aligned input[type="time"], +.table-left-aligned input[type="week"], +.table-left-aligned input[type="number"], +.table-left-aligned input[type="email"], +.table-left-aligned input[type="url"], +.table-left-aligned input[type="search"], +.table-left-aligned input[type="tel"], +.table-left-aligned input[type="color"], +.table-left-aligned .uneditable-input { + margin-bottom: 0; +} +th.tablesorter-header { + background: url("data:image/gif;base64,R0lGODlhFQAJAIAAACMtMP///yH5BAEAAAEALAAAAAAVAAkAAAIXjI+AywnaYnhUMoqt3gZXPmVg94yJVQAAOw==") no-repeat center right; + cursor: pointer; + padding-left: 20px; + border-right: 1px solid #dad9c7; + border-left: 1px solid #dad9c7; + margin-left: -1px; +} +th.sorter-false { + background: none; + cursor: auto; + padding-left: 0; + border: none; + margin-left: 0; +} +th.tablesorter-headerAsc { + background: #F9F9F9 url("data:image/gif;base64,R0lGODlhFQAEAIAAACMtMP///yH5BAEAAAEALAAAAAAVAAQAAAINjB+gC+jP2ptn0WskLQA7") no-repeat center right; +} +th.tablesorter-headerDesc { + background: #F9F9F9 url("data:image/gif;base64,R0lGODlhFQAEAIAAACMtMP///yH5BAEAAAEALAAAAAAVAAQAAAINjI8Bya2wnINUMopZAQA7") no-repeat center right; +} +.tablesorter .disabled { + display: none; +} +.tablesorter .value-popup:after { + content: attr(data-value); + position: absolute; + bottom: 14px; + left: -7px; + min-width: 18px; + background-image: -webkit-gradient(linear,left 0%,left 100%,from(#f39922),to(#e3530b)); + background-image: -webkit-linear-gradient(top,#f39922,0%,#e3530b,100%); + background-image: -moz-linear-gradient(top,#f39922 0%,#e3530b 100%); + background-image: linear-gradient(to bottom,#f39922 0%,#e3530b 100%); + background-repeat: repeat-x; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff39922', endColorstr='#ffe3530b', GradientType=0); + box-shadow: inset 0px 0px 2px rgba(250,250,250,0.5), 0px 1px 3px rgba(0,0,0,0.2); + color: white; + font-size: 11px; + padding: 2px 5px; + text-align: center; +} +.tablesorter .value-popup:before { + content: ""; + position: absolute; + width: 0; + height: 0; + border-top: 8px solid #777; + border-left: 8px solid transparent; + border-right: 8px solid transparent; + top: -8px; + left: 50%; + margin-left: -8px; + margin-top: -1px; +} +.wizard { + background-color: #fff; + border: 1px solid #d4d4d4; + border-radius: 4px; + -webkit-box-shadow: 0 1px 4px rgba(0,0,0,0.065); + box-shadow: 0 1px 4px rgba(0,0,0,0.065); + *zoom: 1; + margin-bottom: 20px; +} +.wizard:before, +.wizard:after { + display: table; + line-height: 0; + content: ""; + clear: both; +} +.wizard ul { + padding: 0; + margin: 0; + list-style: none outside none; +} +.wizard li { + position: relative; + float: left; + height: 46px; + padding: 0 10px 0 30px; + margin: 0; + font-size: 15px; + line-height: 46px; + color: #999999; + cursor: default; + background: #ededed; +} +.wizard li.complete { + color: #468847; + background: #f3f4f5; +} +.wizard li.complete:hover { + background: #e8e8e8; +} +.wizard li.complete:hover .chevron:before { + border-left: 14px solid #e8e8e8; +} +.wizard li.complete a { + color: inherit; + text-decoration: none; + font-weight: normal; +} +.wizard li.complete .chevron:before { + border-left: 14px solid #f3f4f5; +} +.wizard li.active { + color: #e9720f; + background: #fff; +} +.wizard li.active .chevron:before { + border-left: 14px solid #fff; +} +.wizard li .chevron { + position: absolute; + top: 0; + right: -14px; + display: block; + border: 24px solid transparent; + border-right: 0; + border-left: 14px solid #d4d4d4; +} +.wizard li .chevron:before { + position: absolute; + top: -24px; + right: 1px; + display: block; + border: 24px solid transparent; + border-right: 0; + border-left: 14px solid #ededed; + content: ""; +} +.wizard li .badge { + margin-right: 8px; +} +.wizard li:nth-child(1) { + z-index: 10; + padding-left: 20px; + border-radius: 4px 0 0 4px; +} +.wizard li:nth-child(2) { + z-index: 9; +} +.wizard li:nth-child(3) { + z-index: 8; +} +.wizard li:nth-child(4) { + z-index: 7; +} +.wizard li:nth-child(5) { + z-index: 6; +} +.wizard li:nth-child(6) { + z-index: 5; +} +.wizard li:nth-child(7) { + z-index: 4; +} +.wizard li:nth-child(8) { + z-index: 3; +} +.wizard li:nth-child(9) { + z-index: 2; +} +.wizard li:nth-child(10) { + z-index: 1; +} +.editableform { + margin-bottom: 0; +} +.editableform .control-group { + margin-bottom: 0; + white-space: nowrap; + line-height: 20px; +} +.editable-buttons { + display: inline-block; + vertical-align: top; + margin-left: 7px; + zoom: 1; + *display: inline; +} +.editable-buttons.editable-buttons-bottom { + display: block; + margin-top: 7px; + margin-left: 0; +} +.editable-input { + vertical-align: top; + display: inline-block; + width: auto; + white-space: normal; + zoom: 1; + *display: inline; +} +.editable-buttons .editable-cancel { + margin-left: 7px; +} +.editable-buttons button.ui-button-icon-only { + height: 24px; + width: 30px; +} +.editableform-loading { + background: url(data:image/gif;base64,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) center center no-repeat; + height: 25px; + width: auto; + min-width: 25px; +} +.editable-inline .editableform-loading { + background-position: left 5px; +} +.editable-error-block { + max-width: 300px; + margin: 5px 0 0 0; + width: auto; + white-space: normal; +} +.editable-error-block.ui-state-error { + padding: 3px; +} +.editable-error { + color: red; +} +.editableform .editable-date { + padding: 0; + margin: 0; + float: left; +} +.editable-inline .add-on .icon-th { + margin-top: 3px; + margin-left: 1px; +} +.editable-checklist label input[type="checkbox"], +.editable-checklist label span { + vertical-align: middle; + margin: 0; +} +.editable-checklist label { + white-space: nowrap; +} +.editable-wysihtml5 { + width: 566px; + height: 250px; +} +.editable-clear { + clear: both; + font-size: 0.9em; + text-decoration: none; + text-align: right; +} +.editable-clear-x { + background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA0AAAANCAQAAADY4iz3AAAAAmJLR0QA/4ePzL8AAAAJcEhZcwAAAEgAAABIAEbJaz4AAAAJdnBBZwAAAA0AAAANABzi0JoAAAEFSURBVBjTNdC/alNhAIbx3/edpGeQlJqElIihpqKYpfYPyRXoUEe33pdXUOjolqXQG2glUnDQkkKVgIRoIDQIpsnJ6ZD2Wd/lfZ5gxYZXqgrmxq7cQkDijabgkaW+vjzBri0hlYFUFlQVjaJNzzmu/D5oBFrJqPNpA03laItS+Pi6XL/cf1c8b6/Xjl6m8CI4VKCVfOk8qViKk+FOb5Djf1SA79lRz1JcLj5cDnKwFi2glZzsi8RC921j9fUuGlMK5+1SdTJ8f/pvXK5/3UthHP1imnevJ8Od3tm8fTH9+/lmBj8DDjwjNXvwWg2+JRhJPM0eUmTkrv2QP+ap2FYTZf7om8A9PrJPoYpSXtIAAAAldEVYdGRhdGU6Y3JlYXRlADIwMTEtMDItMTRUMTE6MTI6MTUrMDI6MDD7C2qGAAAAJXRFWHRkYXRlOm1vZGlmeQAyMDExLTAyLTE0VDExOjEyOjE1KzAyOjAwilbSOgAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAAASUVORK5CYII=) center center no-repeat; + display: block; + width: 13px; + height: 13px; + position: absolute; + opacity: 0.6; + z-index: 100; + top: 50%; + right: 6px; + margin-top: -6px; +} +.editable-clear-x:hover { + opacity: 1; +} +.editable-pre-wrapped { + white-space: pre-wrap; +} +.editable-container.editable-popup { + max-width: none !important; +} +.editable-container.popover { + width: auto; +} +.editable-container.editable-inline { + display: inline-block; + vertical-align: middle; + width: auto; + zoom: 1; + *display: inline; +} +.editable-container.ui-widget { + font-size: inherit; + z-index: 9990; +} +.editable-click, +a.editable-click, +a.editable-click:hover { + text-decoration: none; + border-bottom: dashed 1px #0088cc; +} +.editable-click.editable-disabled, +a.editable-click.editable-disabled, +a.editable-click.editable-disabled:hover { + color: #585858; + cursor: default; + border-bottom: none; +} +.editable-empty, +.editable-empty:hover, +.editable-empty:focus { + font-style: italic; + color: #DD1144; + text-decoration: none; +} +.editable-unsaved { + font-weight: bold; +} +.editable-bg-transition { + -webkit-transition: background-color 1400ms ease-out; + -moz-transition: background-color 1400ms ease-out; + -o-transition: background-color 1400ms ease-out; + -ms-transition: background-color 1400ms ease-out; + transition: background-color 1400ms ease-out; +} +.form-horizontal .editable { + padding-top: 5px; + display: inline-block; +} +.datepicker { + padding: 4px; + -webkit-border-radius: 4px; + -moz-border-radius: 4px; + border-radius: 4px; + direction: ltr; +} +.datepicker-inline { + width: 220px; +} +.datepicker.datepicker-rtl { + direction: rtl; +} +.datepicker.datepicker-rtl table tr td span { + float: right; +} +.datepicker-dropdown { + top: 0; + left: 0; +} +.datepicker-dropdown:before { + content: ''; + display: inline-block; + border-left: 7px solid transparent; + border-right: 7px solid transparent; + border-bottom: 7px solid #ccc; + border-bottom-color: rgba(0,0,0,0.2); + position: absolute; + top: -7px; + left: 6px; +} +.datepicker-dropdown:after { + content: ''; + display: inline-block; + border-left: 6px solid transparent; + border-right: 6px solid transparent; + border-bottom: 6px solid #ffffff; + position: absolute; + top: -6px; + left: 7px; +} +.datepicker > div { + display: none; +} +.datepicker.days div.datepicker-days { + display: block; +} +.datepicker.months div.datepicker-months { + display: block; +} +.datepicker.years div.datepicker-years { + display: block; +} +.datepicker table { + margin: 0; +} +.datepicker td, +.datepicker th { + text-align: center; + width: 20px; + height: 20px; + -webkit-border-radius: 4px; + -moz-border-radius: 4px; + border-radius: 4px; + border: none; +} +.table-striped .datepicker table tr td, +.table-striped .datepicker table tr th { + background-color: transparent; +} +.datepicker table tr td.day:hover { + background: #eeeeee; + cursor: pointer; +} +.datepicker table tr td.old, +.datepicker table tr td.new { + color: #999999; +} +.datepicker table tr td.disabled, +.datepicker table tr td.disabled:hover { + background: none; + color: #999999; + cursor: default; +} +.datepicker table tr td.today, +.datepicker table tr td.today:hover, +.datepicker table tr td.today.disabled, +.datepicker table tr td.today.disabled:hover { + background-color: #fde19a; + background-image: -moz-linear-gradient(top,#fdd49a,#fdf59a); + background-image: -ms-linear-gradient(top,#fdd49a,#fdf59a); + background-image: -webkit-gradient(linear,0 0,0 100%,from(#fdd49a),to(#fdf59a)); + background-image: -webkit-linear-gradient(top,#fdd49a,#fdf59a); + background-image: -o-linear-gradient(top,#fdd49a,#fdf59a); + background-image: linear-gradient(top,#fdd49a,#fdf59a); + background-repeat: repeat-x; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fdd49a',endColorstr='#fdf59a',GradientType=0); + border-color: #fdf59a #fdf59a #fbed50; + border-color: rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25); + filter: progid:DXImageTransform.Microsoft.gradient(enabled=false); + color: #000; +} +.datepicker table tr td.today:hover, +.datepicker table tr td.today:hover:hover, +.datepicker table tr td.today.disabled:hover, +.datepicker table tr td.today.disabled:hover:hover, +.datepicker table tr td.today:active, +.datepicker table tr td.today:hover:active, +.datepicker table tr td.today.disabled:active, +.datepicker table tr td.today.disabled:hover:active, +.datepicker table tr td.today.active, +.datepicker table tr td.today:hover.active, +.datepicker table tr td.today.disabled.active, +.datepicker table tr td.today.disabled:hover.active, +.datepicker table tr td.today.disabled, +.datepicker table tr td.today:hover.disabled, +.datepicker table tr td.today.disabled.disabled, +.datepicker table tr td.today.disabled:hover.disabled, +.datepicker table tr td.today[disabled], +.datepicker table tr td.today:hover[disabled], +.datepicker table tr td.today.disabled[disabled], +.datepicker table tr td.today.disabled:hover[disabled] { + background-color: #fdf59a; +} +.datepicker table tr td.today:active, +.datepicker table tr td.today:hover:active, +.datepicker table tr td.today.disabled:active, +.datepicker table tr td.today.disabled:hover:active, +.datepicker table tr td.today.active, +.datepicker table tr td.today:hover.active, +.datepicker table tr td.today.disabled.active, +.datepicker table tr td.today.disabled:hover.active { + background-color: #fbf069 \9; +} +.datepicker table tr td.today:hover:hover { + color: #000; +} +.datepicker table tr td.today.active:hover { + color: #fff; +} +.datepicker table tr td.range, +.datepicker table tr td.range:hover, +.datepicker table tr td.range.disabled, +.datepicker table tr td.range.disabled:hover { + background: #eeeeee; + -webkit-border-radius: 0; + -moz-border-radius: 0; + border-radius: 0; +} +.datepicker table tr td.range.today, +.datepicker table tr td.range.today:hover, +.datepicker table tr td.range.today.disabled, +.datepicker table tr td.range.today.disabled:hover { + background-color: #f3d17a; + background-image: -moz-linear-gradient(top,#f3c17a,#f3e97a); + background-image: -ms-linear-gradient(top,#f3c17a,#f3e97a); + background-image: -webkit-gradient(linear,0 0,0 100%,from(#f3c17a),to(#f3e97a)); + background-image: -webkit-linear-gradient(top,#f3c17a,#f3e97a); + background-image: -o-linear-gradient(top,#f3c17a,#f3e97a); + background-image: linear-gradient(top,#f3c17a,#f3e97a); + background-repeat: repeat-x; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#f3c17a',endColorstr='#f3e97a',GradientType=0); + border-color: #f3e97a #f3e97a #edde34; + border-color: rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25); + filter: progid:DXImageTransform.Microsoft.gradient(enabled=false); + -webkit-border-radius: 0; + -moz-border-radius: 0; + border-radius: 0; +} +.datepicker table tr td.range.today:hover, +.datepicker table tr td.range.today:hover:hover, +.datepicker table tr td.range.today.disabled:hover, +.datepicker table tr td.range.today.disabled:hover:hover, +.datepicker table tr td.range.today:active, +.datepicker table tr td.range.today:hover:active, +.datepicker table tr td.range.today.disabled:active, +.datepicker table tr td.range.today.disabled:hover:active, +.datepicker table tr td.range.today.active, +.datepicker table tr td.range.today:hover.active, +.datepicker table tr td.range.today.disabled.active, +.datepicker table tr td.range.today.disabled:hover.active, +.datepicker table tr td.range.today.disabled, +.datepicker table tr td.range.today:hover.disabled, +.datepicker table tr td.range.today.disabled.disabled, +.datepicker table tr td.range.today.disabled:hover.disabled, +.datepicker table tr td.range.today[disabled], +.datepicker table tr td.range.today:hover[disabled], +.datepicker table tr td.range.today.disabled[disabled], +.datepicker table tr td.range.today.disabled:hover[disabled] { + background-color: #f3e97a; +} +.datepicker table tr td.range.today:active, +.datepicker table tr td.range.today:hover:active, +.datepicker table tr td.range.today.disabled:active, +.datepicker table tr td.range.today.disabled:hover:active, +.datepicker table tr td.range.today.active, +.datepicker table tr td.range.today:hover.active, +.datepicker table tr td.range.today.disabled.active, +.datepicker table tr td.range.today.disabled:hover.active { + background-color: #efe24b \9; +} +.datepicker table tr td.selected, +.datepicker table tr td.selected:hover, +.datepicker table tr td.selected.disabled, +.datepicker table tr td.selected.disabled:hover { + background-color: #9e9e9e; + background-image: -moz-linear-gradient(top,#b3b3b3,#808080); + background-image: -ms-linear-gradient(top,#b3b3b3,#808080); + background-image: -webkit-gradient(linear,0 0,0 100%,from(#b3b3b3),to(#808080)); + background-image: -webkit-linear-gradient(top,#b3b3b3,#808080); + background-image: -o-linear-gradient(top,#b3b3b3,#808080); + background-image: linear-gradient(top,#b3b3b3,#808080); + background-repeat: repeat-x; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#b3b3b3',endColorstr='#808080',GradientType=0); + border-color: #808080 #808080 #595959; + border-color: rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25); + filter: progid:DXImageTransform.Microsoft.gradient(enabled=false); + color: #fff; + text-shadow: 0 -1px 0 rgba(0,0,0,0.25); +} +.datepicker table tr td.selected:hover, +.datepicker table tr td.selected:hover:hover, +.datepicker table tr td.selected.disabled:hover, +.datepicker table tr td.selected.disabled:hover:hover, +.datepicker table tr td.selected:active, +.datepicker table tr td.selected:hover:active, +.datepicker table tr td.selected.disabled:active, +.datepicker table tr td.selected.disabled:hover:active, +.datepicker table tr td.selected.active, +.datepicker table tr td.selected:hover.active, +.datepicker table tr td.selected.disabled.active, +.datepicker table tr td.selected.disabled:hover.active, +.datepicker table tr td.selected.disabled, +.datepicker table tr td.selected:hover.disabled, +.datepicker table tr td.selected.disabled.disabled, +.datepicker table tr td.selected.disabled:hover.disabled, +.datepicker table tr td.selected[disabled], +.datepicker table tr td.selected:hover[disabled], +.datepicker table tr td.selected.disabled[disabled], +.datepicker table tr td.selected.disabled:hover[disabled] { + background-color: #808080; +} +.datepicker table tr td.selected:active, +.datepicker table tr td.selected:hover:active, +.datepicker table tr td.selected.disabled:active, +.datepicker table tr td.selected.disabled:hover:active, +.datepicker table tr td.selected.active, +.datepicker table tr td.selected:hover.active, +.datepicker table tr td.selected.disabled.active, +.datepicker table tr td.selected.disabled:hover.active { + background-color: #666666 \9; +} +.datepicker table tr td.active, +.datepicker table tr td.active:hover, +.datepicker table tr td.active.disabled, +.datepicker table tr td.active.disabled:hover { + background-color: #006dcc; + background-image: -moz-linear-gradient(top,#0088cc,#0044cc); + background-image: -ms-linear-gradient(top,#0088cc,#0044cc); + background-image: -webkit-gradient(linear,0 0,0 100%,from(#0088cc),to(#0044cc)); + background-image: -webkit-linear-gradient(top,#0088cc,#0044cc); + background-image: -o-linear-gradient(top,#0088cc,#0044cc); + background-image: linear-gradient(top,#0088cc,#0044cc); + background-repeat: repeat-x; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#0088cc',endColorstr='#0044cc',GradientType=0); + border-color: #0044cc #0044cc #002a80; + border-color: rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25); + filter: progid:DXImageTransform.Microsoft.gradient(enabled=false); + color: #fff; + text-shadow: 0 -1px 0 rgba(0,0,0,0.25); +} +.datepicker table tr td.active:hover, +.datepicker table tr td.active:hover:hover, +.datepicker table tr td.active.disabled:hover, +.datepicker table tr td.active.disabled:hover:hover, +.datepicker table tr td.active:active, +.datepicker table tr td.active:hover:active, +.datepicker table tr td.active.disabled:active, +.datepicker table tr td.active.disabled:hover:active, +.datepicker table tr td.active.active, +.datepicker table tr td.active:hover.active, +.datepicker table tr td.active.disabled.active, +.datepicker table tr td.active.disabled:hover.active, +.datepicker table tr td.active.disabled, +.datepicker table tr td.active:hover.disabled, +.datepicker table tr td.active.disabled.disabled, +.datepicker table tr td.active.disabled:hover.disabled, +.datepicker table tr td.active[disabled], +.datepicker table tr td.active:hover[disabled], +.datepicker table tr td.active.disabled[disabled], +.datepicker table tr td.active.disabled:hover[disabled] { + background-color: #0044cc; +} +.datepicker table tr td.active:active, +.datepicker table tr td.active:hover:active, +.datepicker table tr td.active.disabled:active, +.datepicker table tr td.active.disabled:hover:active, +.datepicker table tr td.active.active, +.datepicker table tr td.active:hover.active, +.datepicker table tr td.active.disabled.active, +.datepicker table tr td.active.disabled:hover.active { + background-color: #003399 \9; +} +.datepicker table tr td span { + display: block; + width: 23%; + height: 54px; + line-height: 54px; + float: left; + margin: 1%; + cursor: pointer; + -webkit-border-radius: 4px; + -moz-border-radius: 4px; + border-radius: 4px; +} +.datepicker table tr td span:hover { + background: #eeeeee; +} +.datepicker table tr td span.disabled, +.datepicker table tr td span.disabled:hover { + background: none; + color: #999999; + cursor: default; +} +.datepicker table tr td span.active, +.datepicker table tr td span.active:hover, +.datepicker table tr td span.active.disabled, +.datepicker table tr td span.active.disabled:hover { + background-color: #006dcc; + background-image: -moz-linear-gradient(top,#0088cc,#0044cc); + background-image: -ms-linear-gradient(top,#0088cc,#0044cc); + background-image: -webkit-gradient(linear,0 0,0 100%,from(#0088cc),to(#0044cc)); + background-image: -webkit-linear-gradient(top,#0088cc,#0044cc); + background-image: -o-linear-gradient(top,#0088cc,#0044cc); + background-image: linear-gradient(top,#0088cc,#0044cc); + background-repeat: repeat-x; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#0088cc',endColorstr='#0044cc',GradientType=0); + border-color: #0044cc #0044cc #002a80; + border-color: rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25); + filter: progid:DXImageTransform.Microsoft.gradient(enabled=false); + color: #fff; + text-shadow: 0 -1px 0 rgba(0,0,0,0.25); +} +.datepicker table tr td span.active:hover, +.datepicker table tr td span.active:hover:hover, +.datepicker table tr td span.active.disabled:hover, +.datepicker table tr td span.active.disabled:hover:hover, +.datepicker table tr td span.active:active, +.datepicker table tr td span.active:hover:active, +.datepicker table tr td span.active.disabled:active, +.datepicker table tr td span.active.disabled:hover:active, +.datepicker table tr td span.active.active, +.datepicker table tr td span.active:hover.active, +.datepicker table tr td span.active.disabled.active, +.datepicker table tr td span.active.disabled:hover.active, +.datepicker table tr td span.active.disabled, +.datepicker table tr td span.active:hover.disabled, +.datepicker table tr td span.active.disabled.disabled, +.datepicker table tr td span.active.disabled:hover.disabled, +.datepicker table tr td span.active[disabled], +.datepicker table tr td span.active:hover[disabled], +.datepicker table tr td span.active.disabled[disabled], +.datepicker table tr td span.active.disabled:hover[disabled] { + background-color: #0044cc; +} +.datepicker table tr td span.active:active, +.datepicker table tr td span.active:hover:active, +.datepicker table tr td span.active.disabled:active, +.datepicker table tr td span.active.disabled:hover:active, +.datepicker table tr td span.active.active, +.datepicker table tr td span.active:hover.active, +.datepicker table tr td span.active.disabled.active, +.datepicker table tr td span.active.disabled:hover.active { + background-color: #003399 \9; +} +.datepicker table tr td span.old, +.datepicker table tr td span.new { + color: #999999; +} +.datepicker th.datepicker-switch { + width: 145px; +} +.datepicker thead tr:first-child th, +.datepicker tfoot tr th { + cursor: pointer; +} +.datepicker thead tr:first-child th:hover, +.datepicker tfoot tr th:hover { + background: #eeeeee; +} +.datepicker .cw { + font-size: 10px; + width: 12px; + padding: 0 2px 0 5px; + vertical-align: middle; +} +.datepicker thead tr:first-child th.cw { + cursor: default; + background-color: transparent; +} +.input-append.date .add-on i, +.input-prepend.date .add-on i { + display: block; + cursor: pointer; + width: 16px; + height: 16px; +} +.input-daterange input { + text-align: center; +} +.input-daterange input:first-child { + -webkit-border-radius: 3px 0 0 3px; + -moz-border-radius: 3px 0 0 3px; + border-radius: 3px 0 0 3px; +} +.input-daterange input:last-child { + -webkit-border-radius: 0 3px 3px 0; + -moz-border-radius: 0 3px 3px 0; + border-radius: 0 3px 3px 0; +} +.input-daterange .add-on { + display: inline-block; + width: auto; + min-width: 16px; + height: 18px; + padding: 4px 5px; + font-weight: normal; + line-height: 18px; + text-align: center; + text-shadow: 0 1px 0 #ffffff; + vertical-align: middle; + background-color: #eeeeee; + border: 1px solid #ccc; + margin-left: -5px; + margin-right: -5px; +} +.has-switch { + display: inline-block; + cursor: pointer; + border-radius: 4px; + border: 1px solid; + border-color: rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25); + position: relative; + text-align: left; + overflow: hidden; + line-height: 8px; + -webkit-user-select: none; + -moz-user-select: none; + -ms-user-select: none; + -o-user-select: none; + user-select: none; + vertical-align: middle; + min-width: 100px; +} +.has-switch.switch-mini { + min-width: 72px; +} +.has-switch.switch-mini i.switch-mini-icons { + height: 1.20em; + line-height: 9px; + vertical-align: text-top; + text-align: center; + transform: scale(0.6); + margin-top: -1px; + margin-bottom: -1px; +} +.has-switch.switch-small { + min-width: 80px; +} +.has-switch.switch-large { + min-width: 120px; +} +.has-switch.deactivate { + opacity: 50; + filter: alpha(opacity=5000); + cursor: default !important; +} +.has-switch.deactivate label, +.has-switch.deactivate span { + cursor: default !important; +} +.has-switch > div { + display: inline-block; + width: 150%; + position: relative; + top: 0; +} +.has-switch > div.switch-animate { + -webkit-transition: left 0.5s; + transition: left 0.5s; +} +.has-switch > div.switch-off { + left: -50%; +} +.has-switch > div.switch-on { + left: 0%; +} +.has-switch input[type=radio], +.has-switch input[type=checkbox] { + display: none; +} +.has-switch span, +.has-switch label { + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box; + cursor: pointer; + position: relative; + display: inline-block; + height: 100%; + padding-bottom: 4px; + padding-top: 4px; + font-size: 14px; + line-height: 20px; +} +.has-switch span.switch-mini, +.has-switch label.switch-mini { + padding-bottom: 4px; + padding-top: 4px; + font-size: 10px; + line-height: 9px; +} +.has-switch span.switch-small, +.has-switch label.switch-small { + padding-bottom: 3px; + padding-top: 3px; + font-size: 12px; + line-height: 18px; +} +.has-switch span.switch-large, +.has-switch label.switch-large { + padding-bottom: 9px; + padding-top: 9px; + font-size: 16px; + line-height: normal; +} +.has-switch label { + text-align: center; + margin-top: -1px; + margin-bottom: -1px; + z-index: 100; + width: 34%; + border-left: 1px solid #ccc; + border-right: 1px solid #ccc; + color: #333; + background-color: #fff; + border-color: #ccc; +} +.has-switch label:hover, +.has-switch label:focus, +.has-switch label:active, +.has-switch label.active, +.open .dropdown-toggle.has-switch label { + color: #333; + background-color: #ebebeb; + border-color: #adadad; +} +.has-switch label:active, +.has-switch label.active, +.open .dropdown-toggle.has-switch label { + background-image: none; +} +.has-switch label.disabled, +.has-switch label.disabled:hover, +.has-switch label.disabled:focus, +.has-switch label.disabled:active, +.has-switch label.disabled.active, +.has-switch label[disabled], +.has-switch label[disabled]:hover, +.has-switch label[disabled]:focus, +.has-switch label[disabled]:active, +.has-switch label[disabled].active, +fieldset[disabled] .has-switch label, +fieldset[disabled] .has-switch label:hover, +fieldset[disabled] .has-switch label:focus, +fieldset[disabled] .has-switch label:active, +fieldset[disabled] .has-switch label.active { + background-color: #fff; + border-color: #ccc; +} +.has-switch label i { + color: #000; + text-shadow: 0 1px 0 #fff; + line-height: 18px; + pointer-events: none; +} +.has-switch span { + text-align: center; + z-index: 1; + width: 33%; +} +.has-switch span.switch-left { + border-bottom-left-radius: 4px; + border-top-left-radius: 4px; +} +.has-switch span.switch-right { + color: #333; + background-color: #fff; + border-color: #ccc; + border-bottom-right-radius: 4px; + border-top-right-radius: 4px; +} +.has-switch span.switch-right:hover, +.has-switch span.switch-right:focus, +.has-switch span.switch-right:active, +.has-switch span.switch-right.active, +.open .dropdown-toggle.has-switch span.switch-right { + color: #333; + background-color: #ebebeb; + border-color: #adadad; +} +.has-switch span.switch-right:active, +.has-switch span.switch-right.active, +.open .dropdown-toggle.has-switch span.switch-right { + background-image: none; +} +.has-switch span.switch-right.disabled, +.has-switch span.switch-right.disabled:hover, +.has-switch span.switch-right.disabled:focus, +.has-switch span.switch-right.disabled:active, +.has-switch span.switch-right.disabled.active, +.has-switch span.switch-right[disabled], +.has-switch span.switch-right[disabled]:hover, +.has-switch span.switch-right[disabled]:focus, +.has-switch span.switch-right[disabled]:active, +.has-switch span.switch-right[disabled].active, +fieldset[disabled] .has-switch span.switch-right, +fieldset[disabled] .has-switch span.switch-right:hover, +fieldset[disabled] .has-switch span.switch-right:focus, +fieldset[disabled] .has-switch span.switch-right:active, +fieldset[disabled] .has-switch span.switch-right.active { + background-color: #fff; + border-color: #ccc; +} +.has-switch span.switch-primary, +.has-switch span.switch-left { + color: #fff; + background-color: #f39922; + border-color: #ef8d0d; +} +.has-switch span.switch-primary:hover, +.has-switch span.switch-primary:focus, +.has-switch span.switch-primary:active, +.has-switch span.switch-primary.active, +.open .dropdown-toggle.has-switch span.switch-primary, +.has-switch span.switch-left:hover, +.has-switch span.switch-left:focus, +.has-switch span.switch-left:active, +.has-switch span.switch-left.active, +.open .dropdown-toggle.has-switch span.switch-left { + color: #fff; + background-color: #e0850c; + border-color: #b46b0a; +} +.has-switch span.switch-primary:active, +.has-switch span.switch-primary.active, +.open .dropdown-toggle.has-switch span.switch-primary, +.has-switch span.switch-left:active, +.has-switch span.switch-left.active, +.open .dropdown-toggle.has-switch span.switch-left { + background-image: none; +} +.has-switch span.switch-primary.disabled, +.has-switch span.switch-primary.disabled:hover, +.has-switch span.switch-primary.disabled:focus, +.has-switch span.switch-primary.disabled:active, +.has-switch span.switch-primary.disabled.active, +.has-switch span.switch-primary[disabled], +.has-switch span.switch-primary[disabled]:hover, +.has-switch span.switch-primary[disabled]:focus, +.has-switch span.switch-primary[disabled]:active, +.has-switch span.switch-primary[disabled].active, +fieldset[disabled] .has-switch span.switch-primary, +fieldset[disabled] .has-switch span.switch-primary:hover, +fieldset[disabled] .has-switch span.switch-primary:focus, +fieldset[disabled] .has-switch span.switch-primary:active, +fieldset[disabled] .has-switch span.switch-primary.active, +.has-switch span.switch-left.disabled, +.has-switch span.switch-left.disabled:hover, +.has-switch span.switch-left.disabled:focus, +.has-switch span.switch-left.disabled:active, +.has-switch span.switch-left.disabled.active, +.has-switch span.switch-left[disabled], +.has-switch span.switch-left[disabled]:hover, +.has-switch span.switch-left[disabled]:focus, +.has-switch span.switch-left[disabled]:active, +.has-switch span.switch-left[disabled].active, +fieldset[disabled] .has-switch span.switch-left, +fieldset[disabled] .has-switch span.switch-left:hover, +fieldset[disabled] .has-switch span.switch-left:focus, +fieldset[disabled] .has-switch span.switch-left:active, +fieldset[disabled] .has-switch span.switch-left.active { + background-color: #f39922; + border-color: #ef8d0d; +} +.has-switch span.switch-info { + color: #fff; + background-color: #5bc0de; + border-color: #46b8da; +} +.has-switch span.switch-info:hover, +.has-switch span.switch-info:focus, +.has-switch span.switch-info:active, +.has-switch span.switch-info.active, +.open .dropdown-toggle.has-switch span.switch-info { + color: #fff; + background-color: #39b3d7; + border-color: #269abc; +} +.has-switch span.switch-info:active, +.has-switch span.switch-info.active, +.open .dropdown-toggle.has-switch span.switch-info { + background-image: none; +} +.has-switch span.switch-info.disabled, +.has-switch span.switch-info.disabled:hover, +.has-switch span.switch-info.disabled:focus, +.has-switch span.switch-info.disabled:active, +.has-switch span.switch-info.disabled.active, +.has-switch span.switch-info[disabled], +.has-switch span.switch-info[disabled]:hover, +.has-switch span.switch-info[disabled]:focus, +.has-switch span.switch-info[disabled]:active, +.has-switch span.switch-info[disabled].active, +fieldset[disabled] .has-switch span.switch-info, +fieldset[disabled] .has-switch span.switch-info:hover, +fieldset[disabled] .has-switch span.switch-info:focus, +fieldset[disabled] .has-switch span.switch-info:active, +fieldset[disabled] .has-switch span.switch-info.active { + background-color: #5bc0de; + border-color: #46b8da; +} +.has-switch span.switch-success { + color: #fff; + background-color: #5cb85c; + border-color: #4cae4c; +} +.has-switch span.switch-success:hover, +.has-switch span.switch-success:focus, +.has-switch span.switch-success:active, +.has-switch span.switch-success.active, +.open .dropdown-toggle.has-switch span.switch-success { + color: #fff; + background-color: #47a447; + border-color: #398439; +} +.has-switch span.switch-success:active, +.has-switch span.switch-success.active, +.open .dropdown-toggle.has-switch span.switch-success { + background-image: none; +} +.has-switch span.switch-success.disabled, +.has-switch span.switch-success.disabled:hover, +.has-switch span.switch-success.disabled:focus, +.has-switch span.switch-success.disabled:active, +.has-switch span.switch-success.disabled.active, +.has-switch span.switch-success[disabled], +.has-switch span.switch-success[disabled]:hover, +.has-switch span.switch-success[disabled]:focus, +.has-switch span.switch-success[disabled]:active, +.has-switch span.switch-success[disabled].active, +fieldset[disabled] .has-switch span.switch-success, +fieldset[disabled] .has-switch span.switch-success:hover, +fieldset[disabled] .has-switch span.switch-success:focus, +fieldset[disabled] .has-switch span.switch-success:active, +fieldset[disabled] .has-switch span.switch-success.active { + background-color: #5cb85c; + border-color: #4cae4c; +} +.has-switch span.switch-warning { + color: #fff; + background-color: #f0ad4e; + border-color: #eea236; +} +.has-switch span.switch-warning:hover, +.has-switch span.switch-warning:focus, +.has-switch span.switch-warning:active, +.has-switch span.switch-warning.active, +.open .dropdown-toggle.has-switch span.switch-warning { + color: #fff; + background-color: #ed9c28; + border-color: #d58512; +} +.has-switch span.switch-warning:active, +.has-switch span.switch-warning.active, +.open .dropdown-toggle.has-switch span.switch-warning { + background-image: none; +} +.has-switch span.switch-warning.disabled, +.has-switch span.switch-warning.disabled:hover, +.has-switch span.switch-warning.disabled:focus, +.has-switch span.switch-warning.disabled:active, +.has-switch span.switch-warning.disabled.active, +.has-switch span.switch-warning[disabled], +.has-switch span.switch-warning[disabled]:hover, +.has-switch span.switch-warning[disabled]:focus, +.has-switch span.switch-warning[disabled]:active, +.has-switch span.switch-warning[disabled].active, +fieldset[disabled] .has-switch span.switch-warning, +fieldset[disabled] .has-switch span.switch-warning:hover, +fieldset[disabled] .has-switch span.switch-warning:focus, +fieldset[disabled] .has-switch span.switch-warning:active, +fieldset[disabled] .has-switch span.switch-warning.active { + background-color: #f0ad4e; + border-color: #eea236; +} +.has-switch span.switch-danger { + color: #fff; + background-color: #d9534f; + border-color: #d43f3a; +} +.has-switch span.switch-danger:hover, +.has-switch span.switch-danger:focus, +.has-switch span.switch-danger:active, +.has-switch span.switch-danger.active, +.open .dropdown-toggle.has-switch span.switch-danger { + color: #fff; + background-color: #d2322d; + border-color: #ac2925; +} +.has-switch span.switch-danger:active, +.has-switch span.switch-danger.active, +.open .dropdown-toggle.has-switch span.switch-danger { + background-image: none; +} +.has-switch span.switch-danger.disabled, +.has-switch span.switch-danger.disabled:hover, +.has-switch span.switch-danger.disabled:focus, +.has-switch span.switch-danger.disabled:active, +.has-switch span.switch-danger.disabled.active, +.has-switch span.switch-danger[disabled], +.has-switch span.switch-danger[disabled]:hover, +.has-switch span.switch-danger[disabled]:focus, +.has-switch span.switch-danger[disabled]:active, +.has-switch span.switch-danger[disabled].active, +fieldset[disabled] .has-switch span.switch-danger, +fieldset[disabled] .has-switch span.switch-danger:hover, +fieldset[disabled] .has-switch span.switch-danger:focus, +fieldset[disabled] .has-switch span.switch-danger:active, +fieldset[disabled] .has-switch span.switch-danger.active { + background-color: #d9534f; + border-color: #d43f3a; +} +.has-switch span.switch-default { + color: #333; + background-color: #fff; + border-color: #ccc; +} +.has-switch span.switch-default:hover, +.has-switch span.switch-default:focus, +.has-switch span.switch-default:active, +.has-switch span.switch-default.active, +.open .dropdown-toggle.has-switch span.switch-default { + color: #333; + background-color: #ebebeb; + border-color: #adadad; +} +.has-switch span.switch-default:active, +.has-switch span.switch-default.active, +.open .dropdown-toggle.has-switch span.switch-default { + background-image: none; +} +.has-switch span.switch-default.disabled, +.has-switch span.switch-default.disabled:hover, +.has-switch span.switch-default.disabled:focus, +.has-switch span.switch-default.disabled:active, +.has-switch span.switch-default.disabled.active, +.has-switch span.switch-default[disabled], +.has-switch span.switch-default[disabled]:hover, +.has-switch span.switch-default[disabled]:focus, +.has-switch span.switch-default[disabled]:active, +.has-switch span.switch-default[disabled].active, +fieldset[disabled] .has-switch span.switch-default, +fieldset[disabled] .has-switch span.switch-default:hover, +fieldset[disabled] .has-switch span.switch-default:focus, +fieldset[disabled] .has-switch span.switch-default:active, +fieldset[disabled] .has-switch span.switch-default.active { + background-color: #fff; + border-color: #ccc; +} +#wrapper { + padding-top: 20px; +} +.footer { + background: none repeat scroll 0 0 transparent; + border: medium none; + box-shadow: none; + color: #7D756A; + margin-bottom: 0; + padding: 35px 15px 15px; + text-align: left; +} +.topbar { + background: url(data:image/jpeg;base64,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AAEANQAAAAEALQAAAAYAAAAAAAE4QklNA/gAAAAAAHAAAP////////////////////////////8D6AAAAAD/////////////////////////////A+gAAAAA/////////////////////////////wPoAAAAAP////////////////////////////8D6AAAOEJJTQQAAAAAAAACAAA4QklNBAIAAAAAAAIAADhCSU0EMAAAAAAAAQEAOEJJTQQtAAAAAAAGAAEAAAACOEJJTQQIAAAAAAAQAAAAAQAAAkAAAAJAAAAAADhCSU0EHgAAAAAABAAAAAA4QklNBBoAAAAAA0kAAAAGAAAAAAAAAAAAAAAyAAAAMgAAAAoAVQBuAHQAaQB0AGwAZQBkAC0AMQAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAMgAAADIAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAQAAAAAAAG51bGwAAAACAAAABmJvdW5kc09iamMAAAABAAAAAAAAUmN0MQAAAAQAAAAAVG9wIGxvbmcAAAAAAAAAAExlZnRsb25nAAAAAAAAAABCdG9tbG9uZwAAADIAAAAAUmdodGxvbmcAAAAyAAAABnNsaWNlc1ZsTHMAAAABT2JqYwAAAAEAAAAAAAVzbGljZQAAABIAAAAHc2xpY2VJRGxvbmcAAAAAAAAAB2dyb3VwSURsb25nAAAAAAAAAAZvcmlnaW5lbnVtAAAADEVTbGljZU9yaWdpbgAAAA1hdXRvR2VuZXJhdGVkAAAAAFR5cGVlbnVtAAAACkVTbGljZVR5cGUAAAAASW1nIAAAAAZib3VuZHNPYmpjAAAAAQAAAAAAAFJjdDEAAAAEAAAAAFRvcCBsb25nAAAAAAAAAABMZWZ0bG9uZwAAAAAAAAAAQnRvbWxvbmcAAAAyAAAAAFJnaHRsb25nAAAAMgAAAAN1cmxURVhUAAAAAQAAAAAAAG51bGxURVhUAAAAAQAAAAAAAE1zZ2VURVhUAAAAAQAAAAAABmFsdFRhZ1RFWFQAAAABAAAAAAAOY2VsbFRleHRJc0hUTUxib29sAQAAAAhjZWxsVGV4dFRFWFQAAAABAAAAAAAJaG9yekFsaWduZW51bQAAAA9FU2xpY2VIb3J6QWxpZ24AAAAHZGVmYXVsdAAAAAl2ZXJ0QWxpZ25lbnVtAAAAD0VTbGljZVZlcnRBbGlnbgAAAAdkZWZhdWx0AAAAC2JnQ29sb3JUeXBlZW51bQAAABFFU2xpY2VCR0NvbG9yVHlwZQAAAABOb25lAAAACXRvcE91dHNldGxvbmcAAAAAAAAACmxlZnRPdXRzZXRsb25nAAAAAAAAAAxib3R0b21PdXRzZXRsb25nAAAAAAAAAAtyaWdodE91dHNldGxvbmcAAAAAADhCSU0EKAAAAAAADAAAAAI/8AAAAAAAADhCSU0EFAAAAAAABAAAAAI4QklNBAwAAAAAApwAAAABAAAAMgAAADIAAACYAAAdsAAAAoAAGAAB/9j/7QAMQWRvYmVfQ00AAf/uAA5BZG9iZQBkgAAAAAH/2wCEAAwICAgJCAwJCQwRCwoLERUPDAwPFRgTExUTExgRDAwMDAwMEQwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwBDQsLDQ4NEA4OEBQODg4UFA4ODg4UEQwMDAwMEREMDAwMDAwRDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDP/AABEIADIAMgMBIgACEQEDEQH/3QAEAAT/xAE/AAABBQEBAQEBAQAAAAAAAAADAAECBAUGBwgJCgsBAAEFAQEBAQEBAAAAAAAAAAEAAgMEBQYHCAkKCxAAAQQBAwIEAgUHBggFAwwzAQACEQMEIRIxBUFRYRMicYEyBhSRobFCIyQVUsFiMzRygtFDByWSU/Dh8WNzNRaisoMmRJNUZEXCo3Q2F9JV4mXys4TD03Xj80YnlKSFtJXE1OT0pbXF1eX1VmZ2hpamtsbW5vY3R1dnd4eXp7fH1+f3EQACAgECBAQDBAUGBwcGBTUBAAIRAyExEgRBUWFxIhMFMoGRFKGxQiPBUtHwMyRi4XKCkkNTFWNzNPElBhaisoMHJjXC0kSTVKMXZEVVNnRl4vKzhMPTdePzRpSkhbSVxNTk9KW1xdXl9VZmdoaWprbG1ub2JzdHV2d3h5ent8f/2gAMAwEAAhEDEQA/AODhKAkknIVCUJJJKVCUBJJJStEkoSSU/wD/0ODSSSTkKSSSSUpJJJJSkktEklP/0eDSTSEtwTkLpJSE0hJS6SbcPFLcElLpJtwSSU//0vO/vTj5rNSRU6P3pd+6zkkkOj96X3rOSSU6X3pLNSSU/wD/2ThCSU0EIQAAAAAAVQAAAAEBAAAADwBBAGQAbwBiAGUAIABQAGgAbwB0AG8AcwBoAG8AcAAAABMAQQBkAG8AYgBlACAAUABoAG8AdABvAHMAaABvAHAAIABDAFMANQAAAAEAOEJJTQQGAAAAAAAHAAgAAQABAQD/4Q6caHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLwA8P3hwYWNrZXQgYmVnaW49Iu+7vyIgaWQ9Ilc1TTBNcENlaGlIenJlU3pOVGN6a2M5ZCI/PiA8eDp4bXBtZXRhIHhtbG5zOng9ImFkb2JlOm5zOm1ldGEvIiB4OnhtcHRrPSJBZG9iZSBYTVAgQ29yZSA1LjAtYzA2MCA2MS4xMzQ3NzcsIDIwMTAvMDIvMTItMTc6MzI6MDAgICAgICAgICI+IDxyZGY6UkRGIHhtbG5zOnJkZj0iaHR0cDovL3d3dy53My5vcmcvMTk5OS8wMi8yMi1yZGYtc3ludGF4LW5zIyI+IDxyZGY6RGVzY3JpcHRpb24gcmRmOmFib3V0PSIiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1sbnM6eG1wTU09Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9tbS8iIHhtbG5zOnN0RXZ0PSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvc1R5cGUvUmVzb3VyY2VFdmVudCMiIHhtbG5zOnBob3Rvc2hvcD0iaHR0cDovL25zLmFkb2JlLmNvbS9waG90b3Nob3AvMS4wLyIgeG1sbnM6ZGM9Imh0dHA6Ly9wdXJsLm9yZy9kYy9lbGVtZW50cy8xLjEvIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzUgTWFjaW50b3NoIiB4bXA6Q3JlYXRlRGF0ZT0iMjAxMi0xMS0xMlQxMDozMzo1NSswMTowMCIgeG1wOk1ldGFkYXRhRGF0ZT0iMjAxMi0xMS0xMlQxMDozMzo1NSswMTowMCIgeG1wOk1vZGlmeURhdGU9IjIwMTItMTEtMTJUMTA6MzM6NTUrMDE6MDAiIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6MDQ4MDExNzQwNzIwNjgxMTg3MUZFNUFCMkIzNEVEQzciIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6MDM4MDExNzQwNzIwNjgxMTg3MUZFNUFCMkIzNEVEQzciIHhtcE1NOk9yaWdpbmFsRG9jdW1lbnRJRD0ieG1wLmRpZDowMzgwMTE3NDA3MjA2ODExODcxRkU1QUIyQjM0RURDNyIgcGhvdG9zaG9wOkNvbG9yTW9kZT0iMyIgcGhvdG9zaG9wOklDQ1Byb2ZpbGU9InNSR0IgSUVDNjE5NjYtMi4xIiBkYzpmb3JtYXQ9ImltYWdlL2pwZWciPiA8eG1wTU06SGlzdG9yeT4gPHJkZjpTZXE+IDxyZGY6bGkgc3RFdnQ6YWN0aW9uPSJjcmVhdGVkIiBzdEV2dDppbnN0YW5jZUlEPSJ4bXAuaWlkOjAzODAxMTc0MDcyMDY4MTE4NzFGRTVBQjJCMzRFREM3IiBzdEV2dDp3aGVuPSIyMDEyLTExLTEyVDEwOjMzOjU1KzAxOjAwIiBzdEV2dDpzb2Z0d2FyZUFnZW50PSJBZG9iZSBQaG90b3Nob3AgQ1M1IE1hY2ludG9zaCIvPiA8cmRmOmxpIHN0RXZ0OmFjdGlvbj0ic2F2ZWQiIHN0RXZ0Omluc3RhbmNlSUQ9InhtcC5paWQ6MDQ4MDExNzQwNzIwNjgxMTg3MUZFNUFCMkIzNEVEQzciIHN0RXZ0OndoZW49IjIwMTItMTEtMTJUMTA6MzM6NTUrMDE6MDAiIHN0RXZ0OnNvZnR3YXJlQWdlbnQ9IkFkb2JlIFBob3Rvc2hvcCBDUzUgTWFjaW50b3NoIiBzdEV2dDpjaGFuZ2VkPSIvIi8+IDwvcmRmOlNlcT4gPC94bXBNTTpIaXN0b3J5PiA8cGhvdG9zaG9wOkRvY3VtZW50QW5jZXN0b3JzPiA8cmRmOkJhZz4gPHJkZjpsaT54bXAuZGlkOjAxODAxMTc0MDcyMDY4MTE4NzFGRTIzM0VCNUM5RjY0PC9yZGY6bGk+IDxyZGY6bGk+eG1wLmRpZDowRTY1MDNBQjIwMjE2ODExODhDNkMzRkU5QTc0MEI1QTwvcmRmOmxpPiA8L3JkZjpCYWc+IDwvcGhvdG9zaG9wOkRvY3VtZW50QW5jZXN0b3JzPiA8L3JkZjpEZXNjcmlwdGlvbj4gPC9yZGY6UkRGPiA8L3g6eG1wbWV0YT4gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICA8P3hwYWNrZXQgZW5kPSJ3Ij8+/+IMWElDQ19QUk9GSUxFAAEBAAAMSExpbm8CEAAAbW50clJHQiBYWVogB84AAgAJAAYAMQAAYWNzcE1TRlQAAAAASUVDIHNSR0IAAAAAAAAAAAAAAAEAAPbWAAEAAAAA0y1IUCAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAARY3BydAAAAVAAAAAzZGVzYwAAAYQAAABsd3RwdAAAAfAAAAAUYmtwdAAAAgQAAAAUclhZWgAAAhgAAAAUZ1hZWgAAAiwAAAAUYlhZWgAAAkAAAAAUZG1uZAAAAlQAAABwZG1kZAAAAsQAAACIdnVlZAAAA0wAAACGdmlldwAAA9QAAAAkbHVtaQAAA/gAAAAUbWVhcwAABAwAAAAkdGVjaAAABDAAAAAMclRSQwAABDwAAAgMZ1RSQwAABDwAAAgMYlRSQwAABDwAAAgMdGV4dAAAAABDb3B5cmlnaHQgKGMpIDE5OTggSGV3bGV0dC1QYWNrYXJkIENvbXBhbnkAAGRlc2MAAAAAAAAAEnNSR0IgSUVDNjE5NjYtMi4xAAAAAAAAAAAAAAASc1JHQiBJRUM2MTk2Ni0yLjEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFhZWiAAAAAAAADzUQABAAAAARbMWFlaIAAAAAAAAAAAAAAAAAAAAABYWVogAAAAAAAAb6IAADj1AAADkFhZWiAAAAAAAABimQAAt4UAABjaWFlaIAAAAAAAACSgAAAPhAAAts9kZXNj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) repeat-x; + font-weight: bold; +} +.topbar .version-info { + line-height: 50px; + height: 50px; + background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAJwAAAAvCAYAAAAW5qOWAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyRpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMC1jMDYxIDY0LjE0MDk0OSwgMjAxMC8xMi8wNy0xMDo1NzowMSAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENTNS4xIE1hY2ludG9zaCIgeG1wTU06SW5zdGFuY2VJRD0ieG1wLmlpZDo5NTM1OTFFOTEzMEYxMUUzQUM0NzhCNTI2QzMwMjA5NSIgeG1wTU06RG9jdW1lbnRJRD0ieG1wLmRpZDo5NTM1OTFFQTEzMEYxMUUzQUM0NzhCNTI2QzMwMjA5NSI+IDx4bXBNTTpEZXJpdmVkRnJvbSBzdFJlZjppbnN0YW5jZUlEPSJ4bXAuaWlkOjk1MzU5MUU3MTMwRjExRTNBQzQ3OEI1MjZDMzAyMDk1IiBzdFJlZjpkb2N1bWVudElEPSJ4bXAuZGlkOjk1MzU5MUU4MTMwRjExRTNBQzQ3OEI1MjZDMzAyMDk1Ii8+IDwvcmRmOkRlc2NyaXB0aW9uPiA8L3JkZjpSREY+IDwveDp4bXBtZXRhPiA8P3hwYWNrZXQgZW5kPSJyIj8+CXYv9AAAGKpJREFUeNrsXAl0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) left -3px no-repeat; + padding-left: 170px; + text-shadow: 0px 1px 1px black; + color: #6d737b; +} +.topbar .form-search, +.topbar .btn-group { + margin-top: 10px; +} +.loginpage .hero-unit { + background-color: transparent; +} +.loginpage .hero-unit h1 { + margin-bottom: 25px; +} +.loginpage .well { + background-color: #E4E3DE; + border: 1px solid rgba(0,0,0,0.2); + box-shadow: 0 -4px 0 rgba(0,0,0,0.05) inset; +} +.feed-list h2 { + font-size: 24px; + line-height: 120%; + color: #E9730F; +} +.feed-list h2 a:hover { + color: inherit; + text-decoration: none; +} +.feed-list h3 { + margin-bottom: 0; + padding-bottom: 0; + font-size: 90%; + line-height: 100%; +} +.feed-list .feed-list-item { + padding: 10px 20px; +} +.brandbar { + background: url(data:image/jpeg;base64,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AP////////////////////////////8D6AAAAAD/////////////////////////////A+gAAAAA/////////////////////////////wPoAAA4QklNBAAAAAAAAAIAADhCSU0EAgAAAAAAAgAAOEJJTQQwAAAAAAABAQA4QklNBC0AAAAAAAYAAQAAAAI4QklNBAgAAAAAABAAAAABAAACQAAAAkAAAAAAOEJJTQQeAAAAAAAEAAAAADhCSU0EGgAAAAADSQAAAAYAAAAAAAAAAAAAAFoAAAABAAAACgBVAG4AdABpAHQAbABlAGQALQAyAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAAAAAAAAAABAAAAWgAAAAAAAAAAAAAAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAABAAAAABAAAAAAAAbnVsbAAAAAIAAAAGYm91bmRzT2JqYwAAAAEAAAAAAABSY3QxAAAABAAAAABUb3AgbG9uZwAAAAAAAAAATGVmdGxvbmcAAAAAAAAAAEJ0b21sb25nAAAAWgAAAABSZ2h0bG9uZwAAAAEAAAAGc2xpY2VzVmxMcwAAAAFPYmpjAAAAAQAAAAAABXNsaWNlAAAAEgAAAAdzbGljZUlEbG9uZwAAAAAAAAAHZ3JvdXBJRGxvbmcAAAAAAAAABm9yaWdpbmVudW0AAAAMRVNsaWNlT3JpZ2luAAAADWF1dG9HZW5lcmF0ZWQAAAAAVHlwZWVudW0AAAAKRVNsaWNlVHlwZQAAAABJbWcgAAAABmJvdW5kc09iamMAAAABAAAAAAAAUmN0MQAAAAQAAAAAVG9wIGxvbmcAAAAAAAAAAExlZnRsb25nAAAAAAAAAABCdG9tbG9uZwAAAFoAAAAAUmdodGxvbmcAAAABAAAAA3VybFRFWFQAAAABAAAAAAAAbnVsbFRFWFQAAAABAAAAAAAATXNnZVRFWFQAAAABAAAAAAAGYWx0VGFnVEVYVAAAAAEAAAAAAA5jZWxsVGV4dElzSFRNTGJvb2wBAAAACGNlbGxUZXh0VEVYVAAAAAEAAAAAAAlob3J6QWxpZ25lbnVtAAAAD0VTbGljZUhvcnpBbGlnbgAAAAdkZWZhdWx0AAAACXZlcnRBbGlnbmVudW0AAAAPRVNsaWNlVmVydEFsaWduAAAAB2RlZmF1bHQAAAALYmdDb2xvclR5cGVlbnVtAAAAEUVTbGljZUJHQ29sb3JUeXBlAAAAAE5vbmUAAAAJdG9wT3V0c2V0bG9uZwAAAAAAAAAKbGVmdE91dHNldGxvbmcAAAAAAAAADGJvdHRvbU91dHNldGxvbmcAAAAAAAAAC3JpZ2h0T3V0c2V0bG9uZwAAAAAAOEJJTQQoAAAAAAAMAAAAAj/wAAAAAAAAOEJJTQQUAAAAAAAEAAAAAjhCSU0EDAAAAAACXwAAAAEAAAABAAAAWgAAAAQAAAFoAAACQwAYAAH/2P/tAAxBZG9iZV9DTQAB/+4ADkFkb2JlAGSAAAAAAf/bAIQADAgICAkIDAkJDBELCgsRFQ8MDA8VGBMTFRMTGBEMDAwMDAwRDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAENCwsNDg0QDg4QFA4ODhQUDg4ODhQRDAwMDAwREQwMDAwMDBEMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwM/8AAEQgAWgABAwEiAAIRAQMRAf/dAAQAAf/EAT8AAAEFAQEBAQEBAAAAAAAAAAMAAQIEBQYHCAkKCwEAAQUBAQEBAQEAAAAAAAAAAQACAwQFBgcICQoLEAABBAEDAgQCBQcGCAUDDDMBAAIRAwQhEjEFQVFhEyJxgTIGFJGhsUIjJBVSwWIzNHKC0UMHJZJT8OHxY3M1FqKygyZEk1RkRcKjdDYX0lXiZfKzhMPTdePzRieUpIW0lcTU5PSltcXV5fVWZnaGlqa2xtbm9jdHV2d3h5ent8fX5/cRAAICAQIEBAMEBQYHBwYFNQEAAhEDITESBEFRYXEiEwUygZEUobFCI8FS0fAzJGLhcoKSQ1MVY3M08SUGFqKygwcmNcLSRJNUoxdkRVU2dGXi8rOEw9N14/NGlKSFtJXE1OT0pbXF1eX1VmZ2hpamtsbW5vYnN0dXZ3eHl6e3x//aAAwDAQACEQMRAD8A5Dc7xP3pKKSctf/Q42UkySch/9Hi5SUZSTkP/9LiJSTJJyH/0+FSTJJyH//U4RJMknIf/9kAOEJJTQQhAAAAAABVAAAAAQEAAAAPAEEAZABvAGIAZQAgAFAAaABvAHQAbwBzAGgAbwBwAAAAEwBBAGQAbwBiAGUAIABQAGgAbwB0AG8AcwBoAG8AcAAgAEMAUwA1AAAAAQA4QklNBAYAAAAAAAcACAABAAEBAP/hDpxodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMC1jMDYwIDYxLjEzNDc3NywgMjAxMC8wMi8xMi0xNzozMjowMCAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RFdnQ9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZUV2ZW50IyIgeG1sbnM6cGhvdG9zaG9wPSJodHRwOi8vbnMuYWRvYmUuY29tL3Bob3Rvc2hvcC8xLjAvIiB4bWxuczpkYz0iaHR0cDovL3B1cmwub3JnL2RjL2VsZW1lbnRzLzEuMS8iIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENTNSBNYWNpbnRvc2giIHhtcDpDcmVhdGVEYXRlPSIyMDEyLTExLTEyVDEwOjMyOjQ3KzAxOjAwIiB4bXA6TWV0YWRhdGFEYXRlPSIyMDEyLTExLTEyVDEwOjMyOjQ3KzAxOjAwIiB4bXA6TW9kaWZ5RGF0ZT0iMjAxMi0xMS0xMlQxMDozMjo0NyswMTowMCIgeG1wTU06SW5zdGFuY2VJRD0ieG1wLmlpZDowMjgwMTE3NDA3MjA2ODExODcxRkU1QUIyQjM0RURDNyIgeG1wTU06RG9jdW1lbnRJRD0ieG1wLmRpZDowMTgwMTE3NDA3MjA2ODExODcxRkU1QUIyQjM0RURDNyIgeG1wTU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjAxODAxMTc0MDcyMDY4MTE4NzFGRTVBQjJCMzRFREM3IiBwaG90b3Nob3A6Q29sb3JNb2RlPSIzIiBwaG90b3Nob3A6SUNDUHJvZmlsZT0ic1JHQiBJRUM2MTk2Ni0yLjEiIGRjOmZvcm1hdD0iaW1hZ2UvanBlZyI+IDx4bXBNTTpIaXN0b3J5PiA8cmRmOlNlcT4gPHJkZjpsaSBzdEV2dDphY3Rpb249ImNyZWF0ZWQiIHN0RXZ0Omluc3RhbmNlSUQ9InhtcC5paWQ6MDE4MDExNzQwNzIwNjgxMTg3MUZFNUFCMkIzNEVEQzciIHN0RXZ0OndoZW49IjIwMTItMTEtMTJUMTA6MzI6NDcrMDE6MDAiIHN0RXZ0OnNvZnR3YXJlQWdlbnQ9IkFkb2JlIFBob3Rvc2hvcCBDUzUgTWFjaW50b3NoIi8+IDxyZGY6bGkgc3RFdnQ6YWN0aW9uPSJzYXZlZCIgc3RFdnQ6aW5zdGFuY2VJRD0ieG1wLmlpZDowMjgwMTE3NDA3MjA2ODExODcxRkU1QUIyQjM0RURDNyIgc3RFdnQ6d2hlbj0iMjAxMi0xMS0xMlQxMDozMjo0NyswMTowMCIgc3RFdnQ6c29mdHdhcmVBZ2VudD0iQWRvYmUgUGhvdG9zaG9wIENTNSBNYWNpbnRvc2giIHN0RXZ0OmNoYW5nZWQ9Ii8iLz4gPC9yZGY6U2VxPiA8L3htcE1NOkhpc3Rvcnk+IDxwaG90b3Nob3A6RG9jdW1lbnRBbmNlc3RvcnM+IDxyZGY6QmFnPiA8cmRmOmxpPnhtcC5kaWQ6MDE4MDExNzQwNzIwNjgxMTg3MUZFMjMzRUI1QzlGNjQ8L3JkZjpsaT4gPHJkZjpsaT54bXAuZGlkOjBFNjUwM0FCMjAyMTY4MTE4OEM2QzNGRTlBNzQwQjVBPC9yZGY6bGk+IDwvcmRmOkJhZz4gPC9waG90b3Nob3A6RG9jdW1lbnRBbmNlc3RvcnM+IDwvcmRmOkRlc2NyaXB0aW9uPiA8L3JkZjpSREY+IDwveDp4bXBtZXRhPiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg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) repeat-x; + height: 90px; +} +.brandbar a.brand { + text-indent: -133337px; + display: block; + float: left; + margin-right: 20px; + background: url(data:image/png;base64,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) 0px 12px no-repeat; + width: 124px; + height: 63px; +} +.brandbar .breadcrumb { + padding: 25px 0px 25px 30px; + background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAoAAABKCAYAAACCasXRAAAACXBIWXMAAAsTAAALEwEAmpwYAAAKT2lDQ1BQaG90b3Nob3AgSUNDIHByb2ZpbGUAAHjanVNnVFPpFj333vRCS4iAlEtvUhUIIFJCi4AUkSYqIQkQSoghodkVUcERRUUEG8igiAOOjoCMFVEsDIoK2AfkIaKOg6OIisr74Xuja9a89+bN/rXXPues852zzwfACAyWSDNRNYAMqUIeEeCDx8TG4eQuQIEKJHAAEAizZCFz/SMBAPh+PDwrIsAHvgABeNMLCADATZvAMByH/w/qQplcAYCEAcB0kThLCIAUAEB6jkKmAEBGAYCdmCZTAKAEAGDLY2LjAFAtAGAnf+bTAICd+Jl7AQBblCEVAaCRACATZYhEAGg7AKzPVopFAFgwABRmS8Q5ANgtADBJV2ZIALC3AMDOEAuyAAgMADBRiIUpAAR7AGDIIyN4AISZABRG8lc88SuuEOcqAAB4mbI8uSQ5RYFbCC1xB1dXLh4ozkkXKxQ2YQJhmkAuwnmZGTKBNA/g88wAAKCRFRHgg/P9eM4Ors7ONo62Dl8t6r8G/yJiYuP+5c+rcEAAAOF0ftH+LC+zGoA7BoBt/qIl7gRoXgugdfeLZrIPQLUAoOnaV/Nw+H48PEWhkLnZ2eXk5NhKxEJbYcpXff5nwl/AV/1s+X48/Pf14L7iJIEyXYFHBPjgwsz0TKUcz5IJhGLc5o9H/LcL//wd0yLESWK5WCoU41EScY5EmozzMqUiiUKSKcUl0v9k4t8s+wM+3zUAsGo+AXuRLahdYwP2SycQWHTA4vcAAPK7b8HUKAgDgGiD4c93/+8//UegJQCAZkmScQAAXkQkLlTKsz/HCAAARKCBKrBBG/TBGCzABhzBBdzBC/xgNoRCJMTCQhBCCmSAHHJgKayCQiiGzbAdKmAv1EAdNMBRaIaTcA4uwlW4Dj1wD/phCJ7BKLyBCQRByAgTYSHaiAFiilgjjggXmYX4IcFIBBKLJCDJiBRRIkuRNUgxUopUIFVIHfI9cgI5h1xGupE7yAAygvyGvEcxlIGyUT3UDLVDuag3GoRGogvQZHQxmo8WoJvQcrQaPYw2oefQq2gP2o8+Q8cwwOgYBzPEbDAuxsNCsTgsCZNjy7EirAyrxhqwVqwDu4n1Y8+xdwQSgUXACTYEd0IgYR5BSFhMWE7YSKggHCQ0EdoJNwkDhFHCJyKTqEu0JroR+cQYYjIxh1hILCPWEo8TLxB7iEPENyQSiUMyJ7mQAkmxpFTSEtJG0m5SI+ksqZs0SBojk8naZGuyBzmULCAryIXkneTD5DPkG+Qh8lsKnWJAcaT4U+IoUspqShnlEOU05QZlmDJBVaOaUt2ooVQRNY9aQq2htlKvUYeoEzR1mjnNgxZJS6WtopXTGmgXaPdpr+h0uhHdlR5Ol9BX0svpR+iX6AP0dwwNhhWDx4hnKBmbGAcYZxl3GK+YTKYZ04sZx1QwNzHrmOeZD5lvVVgqtip8FZHKCpVKlSaVGyovVKmqpqreqgtV81XLVI+pXlN9rkZVM1PjqQnUlqtVqp1Q61MbU2epO6iHqmeob1Q/pH5Z/YkGWcNMw09DpFGgsV/jvMYgC2MZs3gsIWsNq4Z1gTXEJrHN2Xx2KruY/R27iz2qqaE5QzNKM1ezUvOUZj8H45hx+Jx0TgnnKKeX836K3hTvKeIpG6Y0TLkxZVxrqpaXllirSKtRq0frvTau7aedpr1Fu1n7gQ5Bx0onXCdHZ4/OBZ3nU9lT3acKpxZNPTr1ri6qa6UbobtEd79up+6Ynr5egJ5Mb6feeb3n+hx9L/1U/W36p/VHDFgGswwkBtsMzhg8xTVxbzwdL8fb8VFDXcNAQ6VhlWGX4YSRudE8o9VGjUYPjGnGXOMk423GbcajJgYmISZLTepN7ppSTbmmKaY7TDtMx83MzaLN1pk1mz0x1zLnm+eb15vft2BaeFostqi2uGVJsuRaplnutrxuhVo5WaVYVVpds0atna0l1rutu6cRp7lOk06rntZnw7Dxtsm2qbcZsOXYBtuutm22fWFnYhdnt8Wuw+6TvZN9un2N/T0HDYfZDqsdWh1+c7RyFDpWOt6azpzuP33F9JbpL2dYzxDP2DPjthPLKcRpnVOb00dnF2e5c4PziIuJS4LLLpc+Lpsbxt3IveRKdPVxXeF60vWdm7Obwu2o26/uNu5p7ofcn8w0nymeWTNz0MPIQ+BR5dE/C5+VMGvfrH5PQ0+BZ7XnIy9jL5FXrdewt6V3qvdh7xc+9j5yn+M+4zw33jLeWV/MN8C3yLfLT8Nvnl+F30N/I/9k/3r/0QCngCUBZwOJgUGBWwL7+Hp8Ib+OPzrbZfay2e1BjKC5QRVBj4KtguXBrSFoyOyQrSH355jOkc5pDoVQfujW0Adh5mGLw34MJ4WHhVeGP45wiFga0TGXNXfR3ENz30T6RJZE3ptnMU85ry1KNSo+qi5qPNo3ujS6P8YuZlnM1VidWElsSxw5LiquNm5svt/87fOH4p3iC+N7F5gvyF1weaHOwvSFpxapLhIsOpZATIhOOJTwQRAqqBaMJfITdyWOCnnCHcJnIi/RNtGI2ENcKh5O8kgqTXqS7JG8NXkkxTOlLOW5hCepkLxMDUzdmzqeFpp2IG0yPTq9MYOSkZBxQqohTZO2Z+pn5mZ2y6xlhbL+xW6Lty8elQfJa7OQrAVZLQq2QqboVFoo1yoHsmdlV2a/zYnKOZarnivN7cyzytuQN5zvn//tEsIS4ZK2pYZLVy0dWOa9rGo5sjxxedsK4xUFK4ZWBqw8uIq2Km3VT6vtV5eufr0mek1rgV7ByoLBtQFr6wtVCuWFfevc1+1dT1gvWd+1YfqGnRs+FYmKrhTbF5cVf9go3HjlG4dvyr+Z3JS0qavEuWTPZtJm6ebeLZ5bDpaql+aXDm4N2dq0Dd9WtO319kXbL5fNKNu7g7ZDuaO/PLi8ZafJzs07P1SkVPRU+lQ27tLdtWHX+G7R7ht7vPY07NXbW7z3/T7JvttVAVVN1WbVZftJ+7P3P66Jqun4lvttXa1ObXHtxwPSA/0HIw6217nU1R3SPVRSj9Yr60cOxx++/p3vdy0NNg1VjZzG4iNwRHnk6fcJ3/ceDTradox7rOEH0x92HWcdL2pCmvKaRptTmvtbYlu6T8w+0dbq3nr8R9sfD5w0PFl5SvNUyWna6YLTk2fyz4ydlZ19fi753GDborZ752PO32oPb++6EHTh0kX/i+c7vDvOXPK4dPKy2+UTV7hXmq86X23qdOo8/pPTT8e7nLuarrlca7nuer21e2b36RueN87d9L158Rb/1tWeOT3dvfN6b/fF9/XfFt1+cif9zsu72Xcn7q28T7xf9EDtQdlD3YfVP1v+3Njv3H9qwHeg89HcR/cGhYPP/pH1jw9DBY+Zj8uGDYbrnjg+OTniP3L96fynQ89kzyaeF/6i/suuFxYvfvjV69fO0ZjRoZfyl5O/bXyl/erA6xmv28bCxh6+yXgzMV70VvvtwXfcdx3vo98PT+R8IH8o/2j5sfVT0Kf7kxmTk/8EA5jz/GMzLdsAAAAgY0hSTQAAeiUAAICDAAD5/wAAgOkAAHUwAADqYAAAOpgAABdvkl/FRgAAAv9JREFUeNqMVlGS6zYMAyg5u9O/3rgn6Ul6sI1jAv2Q5FW0TvZ5RlZigyAhUTRpGyQDgGzj5dVfFgCBN1dMcwDgnwD5jrX2uczRANArYCzAMV4CPTH6KsbSjV7GuqouE/hpBeo///5XOmC4LH3m7H5Yl4l1Hk9iZuBgnd17Zbxi5cwYU4zjd66ChmVdlmgY/GBcRXEZnpncXVYAx6r8Ksa4YO2MZIHhZuBL5fUcHOvHFqcRgE/lAWADI8AoACvAxkQQJGfGjREVgGAX2GEPtw6QAbsDSw0AtBWwg1LYDhhsGskK4MbtViAZcCCzGAhKtHuMBCuALbZbtSVkFpPBA7QRDNMGh+sbt4+gBUeGjj1sBAE6TSiJphIf8fFZIFGPPQII2WGLEIMk7Qb8LLfPUCYCDNlBJZ0ZYBBs52yIiYiDgoM6yDyCEQRJk4Q6I7fbA4ygFCw1UArJoEk01WyMUapkJEsNRAmCoSBAjt1BAPhAFDIiGNGe99sAse/rxohAi6nNzYBrAdhAshVT8iK7T2A/shyP1xpJsLmuLZ6m7gqHns3l6d0lbiRpL3i8qk5L7Tkzz982F2XPU4X1Um37/2hn2Iah9i2xn8uzT8ZHq2Ae1hcfowG0bVs/2U5DB4DdkiAJdpsl209GCAB3KGWpDdto7N1BuweAu/JI5yHnIShl2JSbuM5cAXz5sct5+ARnytYAYZzCLz92K9N+POTjkEco7qzsjLl/bZCsxiznYVhGWwjDDXjX/Stg2ZnSscuZgmTYTVw/hXc/7jc3YFop5NHAlkFMjI/9L0g23IQoDUuWzy2sAHY/9mxdg3Is+tOCd8bdeWR74ISdbTshwBqJUQEclrIX0uyA/GZra1lbUujom69zGCNJ9A0EsqdYdjZN4xQzXI4P0gw8s6cuL3MB6B0wF4PJdXvhxeUPoCdgLoaXjHoh5qlBWl3rqpPK/n32wvbUn7E3mn934LEM/Inry25Pi2u/A74U8s41fnPt31pXtaNg/dYMv2W76m1fXv8PAN4kfjmx/NePAAAAAElFTkSuQmCC) left center no-repeat; + float: left; + margin: 12px 0px 0px 0px; +} +.brandbar .breadcrumb a { + color: #949aa1; + text-shadow: 0px 1px 0px rgba(0,0,0,0.8); +} +.brandbar .breadcrumb .active { + color: #FFF; + text-shadow: 0px 1px 0px rgba(0,0,0,0.8); + border-bottom: 1px dotted white; +} +.brandbar .Blocmoncompte { + float: right; + margin: 0px; + padding: 0px; + margin-top: 35px; + color: white; + font-size: 13px; + text-shadow: 0px 1px 0px rgba(0,0,0,0.8); +} +.brandbar dt { + float: left; + margin-right: 15px; +} +.brandbar .deconnexion { + float: right; + margin: 0px; +} +.brandbar .deconnexion a { + text-indent: -13337px; + display: block; + background: url(data:image/png;base64,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) no-repeat; + width: 23px; + height: 24px; +} +.brandbar-wide { + width: 100%; +} +.form-signin { + max-width: 400px; + padding: 19px 29px 29px; + margin: 0 auto 20px; + background-color: #fff; + border: 1px solid #e5e5e5; +} +.general-block-decorator { + background: none repeat scroll 0 0 white; + border: 1px solid rgba(0,0,0,0.2); + border-radius: 4px 4px 4px 4px; + box-shadow: 0 -4px 0 rgba(0,0,0,0.05) inset, 0 2px 3px rgba(0,0,0,0.1); + padding: 1em; + margin-bottom: 20px; +} +.general-block-decorator .title { + color: #5A6876; + text-transform: uppercase; + font-weight: bold; + padding-bottom: 0.5em; + line-height: 30px; +} +.general-block-decorator .title-without-tabs { + border-bottom: 2px solid #A5CED8; + margin-bottom: 0.5em; +} +.general-block-decorator .actions { + text-align: right; +} +.tab-pane caption, +.tab-pane .title { + margin-top: 0.5em; +} +.tab-pane caption .btn, +.tab-pane .title .btn { + text-transform: none; +} +.form-container .inner-toolbar { + line-height: 30px; + margin-bottom: 1em; + border-bottom: 1px dotted #A5CED8; + padding-bottom: 0.5em; +} +.form-container .inner-toolbar .inner-actions { + text-align: right; +} +.form-container .inner-toolbar .nav-pills { + margin-bottom: 0; +} +.form-container .inner-toolbar .nav-pills li a { + padding: 4px; + opacity: 0.3; +} +.form-container .inner-toolbar .nav-pills li.active a { + opacity: 1; + background-color: #E7E7E7; +} +.editable-click, +a.editable-click, +a.editable-click:hover { + border-bottom: 1px dotted #0088CC; +} +.ui-slider { + margin-top: 23px; +} +.loading { + background: url(data:image/gif;base64,R0lGODlhHgAeAPf/APW1fPrWtvSlW/rZu/azd/e8iffEmPWsbPW0evnQrfvavvrUs/WwcPOiVfWqZ/759fObSve/j/SiWP3w5fWtbfzu4fa6hPWpYv3y6PavcPW4gfzr2/WrZvnKofzizfaydvzm0/KTOfKYRPSjV/zkz/jKov769vaxcfKWP/vgyfSmXv728Pzl0fzs3fWubPKWRP78+v77+P3y5/e8iP3o1vOhVPzt3/OeT/rSsPnRrvjInvrTsvfAkPvexvvcwv307PnMp/3v4/a8iPnMpvzn1fvfx/OfU/e+i/zq2vW2ff738v3p2fzo1v3n1fjGmvzhy/zn1va5hPfBk/nOqfzgyvfDl/e8hvSgVPSnX/3w4/nNqv717/jElvrXuf317vnSr/azeffCkvnRsPzu4POdUve9ivSeUvnLpfjOqfGPNvKRNvGQNvnOqvjNqfjJofjMpvKXQvfClPjMp/nPrPGONvOaR/jHnfjLpfKQNvfDlvOdTfOfUvKUPPKTOPnOq/jGnPOeUPaxdPa7h/OaSfjJoPWpZfjGm/jNqPjHnvKSN/KUPfjFmvawc/nOrPOdTvOcTPWmYPW3f/fAkvnPrfW3gPa6hva5g/WoYfe+jfKRN/KXQPaxdffFmfjKo/jIn/KWQfa4gfjFmfKYRfOZRv748/e+jvKUOvKVPfWtavKVPvfAkfWpY/fCk/Wvbva7hvW2fvjKpfKSOPWqZPWpZvKZRfSmYPa4g/e/jvfBkva7iPWnYv3x5vW2f/fClfjIoPOeTPObSPSjWvOjV/zjzvjNp/ayc/vbwffDlfnPqvWmYfzm0vjLpvOiVvjJn/OZRfvdw/WrbPjHnPnPq/727/fBkfjKoP3z6/nLo/OeUvjHm/a3f/SfU/nMpPjEmfSoYfOcS/e/jPa2ffOYRPa5gvjDlfSlWvjCk/jDlPjAkve6hfvew/327/a+jfjBkvSoYPjDlvzl0vjAkfjBkfjClfa6g/fDlPzt4PWoYPa+ivSkX/a2f/a3fvObTPa2fPjGnf///yH/C05FVFNDQVBFMi4wAwEAAAAh/wtYTVAgRGF0YVhNUDw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMC1jMDYxIDY0LjE0MDk0OSwgMjAxMC8xMi8wNy0xMDo1NzowMSAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wTU09Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9tbS8iIHhtbG5zOnN0UmVmPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvc1R5cGUvUmVzb3VyY2VSZWYjIiB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iIHhtcE1NOk9yaWdpbmFsRG9jdW1lbnRJRD0ieG1wLmRpZDpDOERGRjk1MDI0MjA2ODExODcxRkExMkExNkM3NjBFQSIgeG1wTU06RG9jdW1lbnRJRD0ieG1wLmRpZDo5ODc0OTkwQjEzMTgxMUUzQUM0NzhCNTI2QzMwMjA5NSIgeG1wTU06SW5zdGFuY2VJRD0ieG1wLmlpZDo5ODc0OTkwQTEzMTgxMUUzQUM0NzhCNTI2QzMwMjA5NSIgeG1wOkNyZWF0b3JUb29sPSJBZG9iZSBQaG90b3Nob3AgQ1M1LjEgTWFjaW50b3NoIj4gPHhtcE1NOkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6QzhERkY5NTAyNDIwNjgxMTg3MUZBMTJBMTZDNzYwRUEiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6QzhERkY5NTAyNDIwNjgxMTg3MUZBMTJBMTZDNzYwRUEiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/eHBhY2tldCBlbmQ9InIiPz4B//79/Pv6+fj39vX08/Lx8O/u7ezr6uno5+bl5OPi4eDf3t3c29rZ2NfW1dTT0tHQz87NzMvKycjHxsXEw8LBwL++vby7urm4t7a1tLOysbCvrq2sq6qpqKempaSjoqGgn56dnJuamZiXlpWUk5KRkI+OjYyLiomIh4aFhIOCgYB/fn18e3p5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) no-repeat; + height: 30px; + width: 30px; +} From 2bebb5697a771120bb70061d3cda875522a1b2b0 Mon Sep 17 00:00:00 2001 From: gmorel Date: Tue, 17 Sep 2013 12:24:20 +0200 Subject: [PATCH 30/74] Working : Fixture : fix coupon table not cleaned --- install/faker.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/install/faker.php b/install/faker.php index aadfc8759..e9b654c6b 100755 --- a/install/faker.php +++ b/install/faker.php @@ -135,6 +135,8 @@ try { \Thelia\Model\FolderDocumentQuery::create()->find()->delete(); \Thelia\Model\ContentDocumentQuery::create()->find()->delete(); + \Thelia\Model\CouponQuery::create()->find()->delete(); + $stmt = $con->prepare("SET foreign_key_checks = 1"); $stmt->execute(); From c4fd65e6ea4ed43acfeb4d0344bfeccf5f118f67 Mon Sep 17 00:00:00 2001 From: Etienne Roudeix Date: Tue, 17 Sep 2013 12:38:23 +0200 Subject: [PATCH 31/74] delivery process --- .../Thelia/Config/Resources/routing/front.xml | 8 +- .../Controller/Front/BaseFrontController.php | 7 + .../Controller/Front/OrderController.php | 26 +- .../Smarty/Plugins/DataAccessFunctions.php | 6 + core/lib/Thelia/Form/OrderDelivery.php | 2 - core/lib/Thelia/Model/AreaDeliveryModule.php | 10 + ...eQuery.php => AreaDeliveryModuleQuery.php} | 9 +- core/lib/Thelia/Model/Base/Area.php | 282 ++++++++------- .../{Delivzone.php => AreaDeliveryModule.php} | 263 +++++++++----- ...eQuery.php => AreaDeliveryModuleQuery.php} | 323 +++++++++++------- core/lib/Thelia/Model/Base/AreaQuery.php | 76 ++--- core/lib/Thelia/Model/Base/ContentFolder.php | 84 ++++- .../Thelia/Model/Base/ContentFolderQuery.php | 33 +- core/lib/Thelia/Model/Base/Module.php | 297 ++++++++++++++++ core/lib/Thelia/Model/Base/ModuleQuery.php | 77 +++++ .../lib/Thelia/Model/Base/ProductCategory.php | 84 ++++- .../Model/Base/ProductCategoryQuery.php | 33 +- core/lib/Thelia/Model/Delivzone.php | 9 - ...Map.php => AreaDeliveryModuleTableMap.php} | 141 ++++---- core/lib/Thelia/Model/Map/AreaTableMap.php | 34 +- .../Model/Map/ContentFolderTableMap.php | 36 +- core/lib/Thelia/Model/Map/ModuleTableMap.php | 2 + .../Model/Map/ProductCategoryTableMap.php | 36 +- install/thelia.sql | 34 +- local/config/schema.xml | 32 +- templates/default/layout.tpl | 2 +- ...cart_delivery.html => order_delivery.html} | 2 +- templates/default/order_invoice.html | 203 +++++++++++ 28 files changed, 1594 insertions(+), 557 deletions(-) create mode 100644 core/lib/Thelia/Model/AreaDeliveryModule.php rename core/lib/Thelia/Model/{DelivzoneQuery.php => AreaDeliveryModuleQuery.php} (59%) mode change 100755 => 100644 rename core/lib/Thelia/Model/Base/{Delivzone.php => AreaDeliveryModule.php} (80%) rename core/lib/Thelia/Model/Base/{DelivzoneQuery.php => AreaDeliveryModuleQuery.php} (53%) delete mode 100755 core/lib/Thelia/Model/Delivzone.php rename core/lib/Thelia/Model/Map/{DelivzoneTableMap.php => AreaDeliveryModuleTableMap.php} (70%) rename templates/default/{cart_delivery.html => order_delivery.html} (99%) create mode 100644 templates/default/order_invoice.html diff --git a/core/lib/Thelia/Config/Resources/routing/front.xml b/core/lib/Thelia/Config/Resources/routing/front.xml index d0791f75b..7705c81cc 100755 --- a/core/lib/Thelia/Config/Resources/routing/front.xml +++ b/core/lib/Thelia/Config/Resources/routing/front.xml @@ -114,17 +114,17 @@ Thelia\Controller\Front\OrderController::deliver - cart_delivery + order_delivery Thelia\Controller\Front\DefaultController::noAction - cart_delivery + order_delivery - + Thelia\Controller\Front\DefaultController::noAction - cart_billing + order_invoice diff --git a/core/lib/Thelia/Controller/Front/BaseFrontController.php b/core/lib/Thelia/Controller/Front/BaseFrontController.php index 1c4a13977..6540f28a4 100755 --- a/core/lib/Thelia/Controller/Front/BaseFrontController.php +++ b/core/lib/Thelia/Controller/Front/BaseFrontController.php @@ -57,4 +57,11 @@ class BaseFrontController extends BaseController $this->redirectToRoute("customer.login.view"); } } + + protected function checkCartNotEmpty() + { + if($this->getSession()->getCart()->countCartItems() == 0) { + $this->redirectToRoute("cart.view"); + } + } } diff --git a/core/lib/Thelia/Controller/Front/OrderController.php b/core/lib/Thelia/Controller/Front/OrderController.php index 7f106d0b2..1bac39b14 100755 --- a/core/lib/Thelia/Controller/Front/OrderController.php +++ b/core/lib/Thelia/Controller/Front/OrderController.php @@ -29,6 +29,7 @@ use Thelia\Core\Event\TheliaEvents; use Symfony\Component\HttpFoundation\Request; use Thelia\Form\OrderDelivery; use Thelia\Log\Tlog; +use Thelia\Model\Base\AddressQuery; use Thelia\Model\Order; /** @@ -45,6 +46,9 @@ class OrderController extends BaseFrontController */ public function deliver() { + $this->checkAuth(); + $this->checkCartNotEmpty(); + $message = false; $orderDelivery = new OrderDelivery($this->getRequest()); @@ -55,15 +59,27 @@ class OrderController extends BaseFrontController try { $form = $this->validateForm($orderDelivery, "post"); - $orderEvent = $this->getOrderEvent(); - $orderEvent->setDeliveryAddress($form->get("delivery-address")->getData()); - $orderEvent->setDeliveryModule($form->get("delivery-module")->getData()); + $deliveryAddressId = $form->get("delivery-address")->getData(); + $deliveryModuleId = $form->get("delivery-module")->getData(); + /* check that the delivery address belong to the current customer */ + $deliveryAddress = AddressQuery::create()->findPk($deliveryAddressId); + if($deliveryAddress->getCustomerId() !== $this->getSecurityContext()->getCustomerUser()->getId()) { + throw new \Exception("Address does not belong to the current customer"); + } + + /* check that the delivery module fetch the delivery address area */ + + + + $orderEvent = $this->getOrderEvent(); + $orderEvent->setDeliveryAddress($deliveryAddressId); + $orderEvent->setDeliveryModule($deliveryModuleId); $this->getDispatcher()->dispatch(TheliaEvents::ORDER_SET_DELIVERY_ADDRESS, $orderEvent); $this->getDispatcher()->dispatch(TheliaEvents::ORDER_SET_DELIVERY_MODULE, $orderEvent); - $this->redirectToRoute("order.billing"); + $this->redirectToRoute("order.invoice"); } catch (FormValidationException $e) { $message = sprintf("Please check your input: %s", $e->getMessage()); @@ -74,7 +90,7 @@ class OrderController extends BaseFrontController } if ($message !== false) { - Tlog::getInstance()->error(sprintf("Error during customer creation process : %s. Exception was %s", $message, $e->getMessage())); + Tlog::getInstance()->error(sprintf("Error during order delivery process : %s. Exception was %s", $message, $e->getMessage())); $orderDelivery->setErrorMessage($message); diff --git a/core/lib/Thelia/Core/Template/Smarty/Plugins/DataAccessFunctions.php b/core/lib/Thelia/Core/Template/Smarty/Plugins/DataAccessFunctions.php index bb220531c..41341f789 100755 --- a/core/lib/Thelia/Core/Template/Smarty/Plugins/DataAccessFunctions.php +++ b/core/lib/Thelia/Core/Template/Smarty/Plugins/DataAccessFunctions.php @@ -186,6 +186,11 @@ class DataAccessFunctions extends AbstractSmartyPlugin return $result; } + public function orderDataAccess($params, &$smarty) + { + return $this->dataAccess("Order", $params, $this->request->getSession()->getOrder()); + } + /** * Lang global data * @@ -300,6 +305,7 @@ class DataAccessFunctions extends AbstractSmartyPlugin new SmartyPluginDescriptor('function', 'country', $this, 'countryDataAccess'), new SmartyPluginDescriptor('function', 'lang', $this, 'langDataAccess'), new SmartyPluginDescriptor('function', 'cart', $this, 'cartDataAccess'), + new SmartyPluginDescriptor('function', 'order', $this, 'orderDataAccess'), ); } } diff --git a/core/lib/Thelia/Form/OrderDelivery.php b/core/lib/Thelia/Form/OrderDelivery.php index 61ef67973..3ef1444f6 100755 --- a/core/lib/Thelia/Form/OrderDelivery.php +++ b/core/lib/Thelia/Form/OrderDelivery.php @@ -71,8 +71,6 @@ class OrderDelivery extends BaseForm if(null === $address) { $context->addViolation("Address ID not found"); - } elseif($address->getCustomerId() !== $this->request->getSession()->getCustomerUser()->getId()) { - $context->addViolation("Address does not belong to you"); } } diff --git a/core/lib/Thelia/Model/AreaDeliveryModule.php b/core/lib/Thelia/Model/AreaDeliveryModule.php new file mode 100644 index 000000000..206625a12 --- /dev/null +++ b/core/lib/Thelia/Model/AreaDeliveryModule.php @@ -0,0 +1,10 @@ +unit; + return $this->postage; } /** @@ -491,25 +491,25 @@ abstract class Area implements ActiveRecordInterface } // setName() /** - * Set the value of [unit] column. + * Set the value of [postage] column. * * @param double $v new value * @return \Thelia\Model\Area The current object (for fluent API support) */ - public function setUnit($v) + public function setPostage($v) { if ($v !== null) { $v = (double) $v; } - if ($this->unit !== $v) { - $this->unit = $v; - $this->modifiedColumns[] = AreaTableMap::UNIT; + if ($this->postage !== $v) { + $this->postage = $v; + $this->modifiedColumns[] = AreaTableMap::POSTAGE; } return $this; - } // setUnit() + } // setPostage() /** * Sets the value of [created_at] column to a normalized version of the date/time value specified. @@ -596,8 +596,8 @@ abstract class Area implements ActiveRecordInterface $col = $row[TableMap::TYPE_NUM == $indexType ? 1 + $startcol : AreaTableMap::translateFieldName('Name', TableMap::TYPE_PHPNAME, $indexType)]; $this->name = (null !== $col) ? (string) $col : null; - $col = $row[TableMap::TYPE_NUM == $indexType ? 2 + $startcol : AreaTableMap::translateFieldName('Unit', TableMap::TYPE_PHPNAME, $indexType)]; - $this->unit = (null !== $col) ? (double) $col : null; + $col = $row[TableMap::TYPE_NUM == $indexType ? 2 + $startcol : AreaTableMap::translateFieldName('Postage', TableMap::TYPE_PHPNAME, $indexType)]; + $this->postage = (null !== $col) ? (double) $col : null; $col = $row[TableMap::TYPE_NUM == $indexType ? 3 + $startcol : AreaTableMap::translateFieldName('CreatedAt', TableMap::TYPE_PHPNAME, $indexType)]; if ($col === '0000-00-00 00:00:00') { @@ -681,7 +681,7 @@ abstract class Area implements ActiveRecordInterface $this->collCountries = null; - $this->collDelivzones = null; + $this->collAreaDeliveryModules = null; } // if (deep) } @@ -834,18 +834,17 @@ abstract class Area implements ActiveRecordInterface } } - if ($this->delivzonesScheduledForDeletion !== null) { - if (!$this->delivzonesScheduledForDeletion->isEmpty()) { - foreach ($this->delivzonesScheduledForDeletion as $delivzone) { - // need to save related object because we set the relation to null - $delivzone->save($con); - } - $this->delivzonesScheduledForDeletion = null; + if ($this->areaDeliveryModulesScheduledForDeletion !== null) { + if (!$this->areaDeliveryModulesScheduledForDeletion->isEmpty()) { + \Thelia\Model\AreaDeliveryModuleQuery::create() + ->filterByPrimaryKeys($this->areaDeliveryModulesScheduledForDeletion->getPrimaryKeys(false)) + ->delete($con); + $this->areaDeliveryModulesScheduledForDeletion = null; } } - if ($this->collDelivzones !== null) { - foreach ($this->collDelivzones as $referrerFK) { + if ($this->collAreaDeliveryModules !== null) { + foreach ($this->collAreaDeliveryModules as $referrerFK) { if (!$referrerFK->isDeleted() && ($referrerFK->isNew() || $referrerFK->isModified())) { $affectedRows += $referrerFK->save($con); } @@ -884,8 +883,8 @@ abstract class Area implements ActiveRecordInterface if ($this->isColumnModified(AreaTableMap::NAME)) { $modifiedColumns[':p' . $index++] = 'NAME'; } - if ($this->isColumnModified(AreaTableMap::UNIT)) { - $modifiedColumns[':p' . $index++] = 'UNIT'; + if ($this->isColumnModified(AreaTableMap::POSTAGE)) { + $modifiedColumns[':p' . $index++] = 'POSTAGE'; } if ($this->isColumnModified(AreaTableMap::CREATED_AT)) { $modifiedColumns[':p' . $index++] = 'CREATED_AT'; @@ -910,8 +909,8 @@ abstract class Area implements ActiveRecordInterface case 'NAME': $stmt->bindValue($identifier, $this->name, PDO::PARAM_STR); break; - case 'UNIT': - $stmt->bindValue($identifier, $this->unit, PDO::PARAM_STR); + case 'POSTAGE': + $stmt->bindValue($identifier, $this->postage, PDO::PARAM_STR); break; case 'CREATED_AT': $stmt->bindValue($identifier, $this->created_at ? $this->created_at->format("Y-m-d H:i:s") : null, PDO::PARAM_STR); @@ -988,7 +987,7 @@ abstract class Area implements ActiveRecordInterface return $this->getName(); break; case 2: - return $this->getUnit(); + return $this->getPostage(); break; case 3: return $this->getCreatedAt(); @@ -1027,7 +1026,7 @@ abstract class Area implements ActiveRecordInterface $result = array( $keys[0] => $this->getId(), $keys[1] => $this->getName(), - $keys[2] => $this->getUnit(), + $keys[2] => $this->getPostage(), $keys[3] => $this->getCreatedAt(), $keys[4] => $this->getUpdatedAt(), ); @@ -1041,8 +1040,8 @@ abstract class Area implements ActiveRecordInterface if (null !== $this->collCountries) { $result['Countries'] = $this->collCountries->toArray(null, true, $keyType, $includeLazyLoadColumns, $alreadyDumpedObjects); } - if (null !== $this->collDelivzones) { - $result['Delivzones'] = $this->collDelivzones->toArray(null, true, $keyType, $includeLazyLoadColumns, $alreadyDumpedObjects); + if (null !== $this->collAreaDeliveryModules) { + $result['AreaDeliveryModules'] = $this->collAreaDeliveryModules->toArray(null, true, $keyType, $includeLazyLoadColumns, $alreadyDumpedObjects); } } @@ -1085,7 +1084,7 @@ abstract class Area implements ActiveRecordInterface $this->setName($value); break; case 2: - $this->setUnit($value); + $this->setPostage($value); break; case 3: $this->setCreatedAt($value); @@ -1119,7 +1118,7 @@ abstract class Area implements ActiveRecordInterface if (array_key_exists($keys[0], $arr)) $this->setId($arr[$keys[0]]); if (array_key_exists($keys[1], $arr)) $this->setName($arr[$keys[1]]); - if (array_key_exists($keys[2], $arr)) $this->setUnit($arr[$keys[2]]); + if (array_key_exists($keys[2], $arr)) $this->setPostage($arr[$keys[2]]); if (array_key_exists($keys[3], $arr)) $this->setCreatedAt($arr[$keys[3]]); if (array_key_exists($keys[4], $arr)) $this->setUpdatedAt($arr[$keys[4]]); } @@ -1135,7 +1134,7 @@ abstract class Area implements ActiveRecordInterface if ($this->isColumnModified(AreaTableMap::ID)) $criteria->add(AreaTableMap::ID, $this->id); if ($this->isColumnModified(AreaTableMap::NAME)) $criteria->add(AreaTableMap::NAME, $this->name); - if ($this->isColumnModified(AreaTableMap::UNIT)) $criteria->add(AreaTableMap::UNIT, $this->unit); + if ($this->isColumnModified(AreaTableMap::POSTAGE)) $criteria->add(AreaTableMap::POSTAGE, $this->postage); if ($this->isColumnModified(AreaTableMap::CREATED_AT)) $criteria->add(AreaTableMap::CREATED_AT, $this->created_at); if ($this->isColumnModified(AreaTableMap::UPDATED_AT)) $criteria->add(AreaTableMap::UPDATED_AT, $this->updated_at); @@ -1202,7 +1201,7 @@ abstract class Area implements ActiveRecordInterface public function copyInto($copyObj, $deepCopy = false, $makeNew = true) { $copyObj->setName($this->getName()); - $copyObj->setUnit($this->getUnit()); + $copyObj->setPostage($this->getPostage()); $copyObj->setCreatedAt($this->getCreatedAt()); $copyObj->setUpdatedAt($this->getUpdatedAt()); @@ -1217,9 +1216,9 @@ abstract class Area implements ActiveRecordInterface } } - foreach ($this->getDelivzones() as $relObj) { + foreach ($this->getAreaDeliveryModules() as $relObj) { if ($relObj !== $this) { // ensure that we don't try to copy a reference to ourselves - $copyObj->addDelivzone($relObj->copy($deepCopy)); + $copyObj->addAreaDeliveryModule($relObj->copy($deepCopy)); } } @@ -1267,8 +1266,8 @@ abstract class Area implements ActiveRecordInterface if ('Country' == $relationName) { return $this->initCountries(); } - if ('Delivzone' == $relationName) { - return $this->initDelivzones(); + if ('AreaDeliveryModule' == $relationName) { + return $this->initAreaDeliveryModules(); } } @@ -1491,31 +1490,31 @@ abstract class Area implements ActiveRecordInterface } /** - * Clears out the collDelivzones collection + * Clears out the collAreaDeliveryModules collection * * This does not modify the database; however, it will remove any associated objects, causing * them to be refetched by subsequent calls to accessor method. * * @return void - * @see addDelivzones() + * @see addAreaDeliveryModules() */ - public function clearDelivzones() + public function clearAreaDeliveryModules() { - $this->collDelivzones = null; // important to set this to NULL since that means it is uninitialized + $this->collAreaDeliveryModules = null; // important to set this to NULL since that means it is uninitialized } /** - * Reset is the collDelivzones collection loaded partially. + * Reset is the collAreaDeliveryModules collection loaded partially. */ - public function resetPartialDelivzones($v = true) + public function resetPartialAreaDeliveryModules($v = true) { - $this->collDelivzonesPartial = $v; + $this->collAreaDeliveryModulesPartial = $v; } /** - * Initializes the collDelivzones collection. + * Initializes the collAreaDeliveryModules collection. * - * By default this just sets the collDelivzones collection to an empty array (like clearcollDelivzones()); + * By default this just sets the collAreaDeliveryModules collection to an empty array (like clearcollAreaDeliveryModules()); * however, you may wish to override this method in your stub class to provide setting appropriate * to your application -- for example, setting the initial array to the values stored in database. * @@ -1524,17 +1523,17 @@ abstract class Area implements ActiveRecordInterface * * @return void */ - public function initDelivzones($overrideExisting = true) + public function initAreaDeliveryModules($overrideExisting = true) { - if (null !== $this->collDelivzones && !$overrideExisting) { + if (null !== $this->collAreaDeliveryModules && !$overrideExisting) { return; } - $this->collDelivzones = new ObjectCollection(); - $this->collDelivzones->setModel('\Thelia\Model\Delivzone'); + $this->collAreaDeliveryModules = new ObjectCollection(); + $this->collAreaDeliveryModules->setModel('\Thelia\Model\AreaDeliveryModule'); } /** - * Gets an array of ChildDelivzone objects which contain a foreign key that references this object. + * Gets an array of ChildAreaDeliveryModule objects which contain a foreign key that references this object. * * If the $criteria is not null, it is used to always fetch the results from the database. * Otherwise the results are fetched from the database the first time, then cached. @@ -1544,109 +1543,109 @@ abstract class Area implements ActiveRecordInterface * * @param Criteria $criteria optional Criteria object to narrow the query * @param ConnectionInterface $con optional connection object - * @return Collection|ChildDelivzone[] List of ChildDelivzone objects + * @return Collection|ChildAreaDeliveryModule[] List of ChildAreaDeliveryModule objects * @throws PropelException */ - public function getDelivzones($criteria = null, ConnectionInterface $con = null) + public function getAreaDeliveryModules($criteria = null, ConnectionInterface $con = null) { - $partial = $this->collDelivzonesPartial && !$this->isNew(); - if (null === $this->collDelivzones || null !== $criteria || $partial) { - if ($this->isNew() && null === $this->collDelivzones) { + $partial = $this->collAreaDeliveryModulesPartial && !$this->isNew(); + if (null === $this->collAreaDeliveryModules || null !== $criteria || $partial) { + if ($this->isNew() && null === $this->collAreaDeliveryModules) { // return empty collection - $this->initDelivzones(); + $this->initAreaDeliveryModules(); } else { - $collDelivzones = ChildDelivzoneQuery::create(null, $criteria) + $collAreaDeliveryModules = ChildAreaDeliveryModuleQuery::create(null, $criteria) ->filterByArea($this) ->find($con); if (null !== $criteria) { - if (false !== $this->collDelivzonesPartial && count($collDelivzones)) { - $this->initDelivzones(false); + if (false !== $this->collAreaDeliveryModulesPartial && count($collAreaDeliveryModules)) { + $this->initAreaDeliveryModules(false); - foreach ($collDelivzones as $obj) { - if (false == $this->collDelivzones->contains($obj)) { - $this->collDelivzones->append($obj); + foreach ($collAreaDeliveryModules as $obj) { + if (false == $this->collAreaDeliveryModules->contains($obj)) { + $this->collAreaDeliveryModules->append($obj); } } - $this->collDelivzonesPartial = true; + $this->collAreaDeliveryModulesPartial = true; } - $collDelivzones->getInternalIterator()->rewind(); + $collAreaDeliveryModules->getInternalIterator()->rewind(); - return $collDelivzones; + return $collAreaDeliveryModules; } - if ($partial && $this->collDelivzones) { - foreach ($this->collDelivzones as $obj) { + if ($partial && $this->collAreaDeliveryModules) { + foreach ($this->collAreaDeliveryModules as $obj) { if ($obj->isNew()) { - $collDelivzones[] = $obj; + $collAreaDeliveryModules[] = $obj; } } } - $this->collDelivzones = $collDelivzones; - $this->collDelivzonesPartial = false; + $this->collAreaDeliveryModules = $collAreaDeliveryModules; + $this->collAreaDeliveryModulesPartial = false; } } - return $this->collDelivzones; + return $this->collAreaDeliveryModules; } /** - * Sets a collection of Delivzone objects related by a one-to-many relationship + * Sets a collection of AreaDeliveryModule objects related by a one-to-many relationship * to the current object. * It will also schedule objects for deletion based on a diff between old objects (aka persisted) * and new objects from the given Propel collection. * - * @param Collection $delivzones A Propel collection. + * @param Collection $areaDeliveryModules A Propel collection. * @param ConnectionInterface $con Optional connection object * @return ChildArea The current object (for fluent API support) */ - public function setDelivzones(Collection $delivzones, ConnectionInterface $con = null) + public function setAreaDeliveryModules(Collection $areaDeliveryModules, ConnectionInterface $con = null) { - $delivzonesToDelete = $this->getDelivzones(new Criteria(), $con)->diff($delivzones); + $areaDeliveryModulesToDelete = $this->getAreaDeliveryModules(new Criteria(), $con)->diff($areaDeliveryModules); - $this->delivzonesScheduledForDeletion = $delivzonesToDelete; + $this->areaDeliveryModulesScheduledForDeletion = $areaDeliveryModulesToDelete; - foreach ($delivzonesToDelete as $delivzoneRemoved) { - $delivzoneRemoved->setArea(null); + foreach ($areaDeliveryModulesToDelete as $areaDeliveryModuleRemoved) { + $areaDeliveryModuleRemoved->setArea(null); } - $this->collDelivzones = null; - foreach ($delivzones as $delivzone) { - $this->addDelivzone($delivzone); + $this->collAreaDeliveryModules = null; + foreach ($areaDeliveryModules as $areaDeliveryModule) { + $this->addAreaDeliveryModule($areaDeliveryModule); } - $this->collDelivzones = $delivzones; - $this->collDelivzonesPartial = false; + $this->collAreaDeliveryModules = $areaDeliveryModules; + $this->collAreaDeliveryModulesPartial = false; return $this; } /** - * Returns the number of related Delivzone objects. + * Returns the number of related AreaDeliveryModule objects. * * @param Criteria $criteria * @param boolean $distinct * @param ConnectionInterface $con - * @return int Count of related Delivzone objects. + * @return int Count of related AreaDeliveryModule objects. * @throws PropelException */ - public function countDelivzones(Criteria $criteria = null, $distinct = false, ConnectionInterface $con = null) + public function countAreaDeliveryModules(Criteria $criteria = null, $distinct = false, ConnectionInterface $con = null) { - $partial = $this->collDelivzonesPartial && !$this->isNew(); - if (null === $this->collDelivzones || null !== $criteria || $partial) { - if ($this->isNew() && null === $this->collDelivzones) { + $partial = $this->collAreaDeliveryModulesPartial && !$this->isNew(); + if (null === $this->collAreaDeliveryModules || null !== $criteria || $partial) { + if ($this->isNew() && null === $this->collAreaDeliveryModules) { return 0; } if ($partial && !$criteria) { - return count($this->getDelivzones()); + return count($this->getAreaDeliveryModules()); } - $query = ChildDelivzoneQuery::create(null, $criteria); + $query = ChildAreaDeliveryModuleQuery::create(null, $criteria); if ($distinct) { $query->distinct(); } @@ -1656,58 +1655,83 @@ abstract class Area implements ActiveRecordInterface ->count($con); } - return count($this->collDelivzones); + return count($this->collAreaDeliveryModules); } /** - * Method called to associate a ChildDelivzone object to this object - * through the ChildDelivzone foreign key attribute. + * Method called to associate a ChildAreaDeliveryModule object to this object + * through the ChildAreaDeliveryModule foreign key attribute. * - * @param ChildDelivzone $l ChildDelivzone + * @param ChildAreaDeliveryModule $l ChildAreaDeliveryModule * @return \Thelia\Model\Area The current object (for fluent API support) */ - public function addDelivzone(ChildDelivzone $l) + public function addAreaDeliveryModule(ChildAreaDeliveryModule $l) { - if ($this->collDelivzones === null) { - $this->initDelivzones(); - $this->collDelivzonesPartial = true; + if ($this->collAreaDeliveryModules === null) { + $this->initAreaDeliveryModules(); + $this->collAreaDeliveryModulesPartial = true; } - if (!in_array($l, $this->collDelivzones->getArrayCopy(), true)) { // only add it if the **same** object is not already associated - $this->doAddDelivzone($l); + if (!in_array($l, $this->collAreaDeliveryModules->getArrayCopy(), true)) { // only add it if the **same** object is not already associated + $this->doAddAreaDeliveryModule($l); } return $this; } /** - * @param Delivzone $delivzone The delivzone object to add. + * @param AreaDeliveryModule $areaDeliveryModule The areaDeliveryModule object to add. */ - protected function doAddDelivzone($delivzone) + protected function doAddAreaDeliveryModule($areaDeliveryModule) { - $this->collDelivzones[]= $delivzone; - $delivzone->setArea($this); + $this->collAreaDeliveryModules[]= $areaDeliveryModule; + $areaDeliveryModule->setArea($this); } /** - * @param Delivzone $delivzone The delivzone object to remove. + * @param AreaDeliveryModule $areaDeliveryModule The areaDeliveryModule object to remove. * @return ChildArea The current object (for fluent API support) */ - public function removeDelivzone($delivzone) + public function removeAreaDeliveryModule($areaDeliveryModule) { - if ($this->getDelivzones()->contains($delivzone)) { - $this->collDelivzones->remove($this->collDelivzones->search($delivzone)); - if (null === $this->delivzonesScheduledForDeletion) { - $this->delivzonesScheduledForDeletion = clone $this->collDelivzones; - $this->delivzonesScheduledForDeletion->clear(); + if ($this->getAreaDeliveryModules()->contains($areaDeliveryModule)) { + $this->collAreaDeliveryModules->remove($this->collAreaDeliveryModules->search($areaDeliveryModule)); + if (null === $this->areaDeliveryModulesScheduledForDeletion) { + $this->areaDeliveryModulesScheduledForDeletion = clone $this->collAreaDeliveryModules; + $this->areaDeliveryModulesScheduledForDeletion->clear(); } - $this->delivzonesScheduledForDeletion[]= $delivzone; - $delivzone->setArea(null); + $this->areaDeliveryModulesScheduledForDeletion[]= clone $areaDeliveryModule; + $areaDeliveryModule->setArea(null); } return $this; } + + /** + * If this collection has already been initialized with + * an identical criteria, it returns the collection. + * Otherwise if this Area is new, it will return + * an empty collection; or if this Area has previously + * been saved, it will retrieve related AreaDeliveryModules from storage. + * + * This method is protected by default in order to keep the public + * api reasonable. You can provide public methods for those you + * actually need in Area. + * + * @param Criteria $criteria optional Criteria object to narrow the query + * @param ConnectionInterface $con optional connection object + * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) + * @return Collection|ChildAreaDeliveryModule[] List of ChildAreaDeliveryModule objects + */ + public function getAreaDeliveryModulesJoinModule($criteria = null, $con = null, $joinBehavior = Criteria::LEFT_JOIN) + { + $query = ChildAreaDeliveryModuleQuery::create(null, $criteria); + $query->joinWith('Module', $joinBehavior); + + return $this->getAreaDeliveryModules($query, $con); + } + /** * Clears the current object and sets all attributes to their default values */ @@ -1715,7 +1739,7 @@ abstract class Area implements ActiveRecordInterface { $this->id = null; $this->name = null; - $this->unit = null; + $this->postage = null; $this->created_at = null; $this->updated_at = null; $this->alreadyInSave = false; @@ -1742,8 +1766,8 @@ abstract class Area implements ActiveRecordInterface $o->clearAllReferences($deep); } } - if ($this->collDelivzones) { - foreach ($this->collDelivzones as $o) { + if ($this->collAreaDeliveryModules) { + foreach ($this->collAreaDeliveryModules as $o) { $o->clearAllReferences($deep); } } @@ -1753,10 +1777,10 @@ abstract class Area implements ActiveRecordInterface $this->collCountries->clearIterator(); } $this->collCountries = null; - if ($this->collDelivzones instanceof Collection) { - $this->collDelivzones->clearIterator(); + if ($this->collAreaDeliveryModules instanceof Collection) { + $this->collAreaDeliveryModules->clearIterator(); } - $this->collDelivzones = null; + $this->collAreaDeliveryModules = null; } /** diff --git a/core/lib/Thelia/Model/Base/Delivzone.php b/core/lib/Thelia/Model/Base/AreaDeliveryModule.php similarity index 80% rename from core/lib/Thelia/Model/Base/Delivzone.php rename to core/lib/Thelia/Model/Base/AreaDeliveryModule.php index deb21997e..38a16dd5a 100644 --- a/core/lib/Thelia/Model/Base/Delivzone.php +++ b/core/lib/Thelia/Model/Base/AreaDeliveryModule.php @@ -17,17 +17,19 @@ use Propel\Runtime\Map\TableMap; use Propel\Runtime\Parser\AbstractParser; use Propel\Runtime\Util\PropelDateTime; use Thelia\Model\Area as ChildArea; +use Thelia\Model\AreaDeliveryModule as ChildAreaDeliveryModule; +use Thelia\Model\AreaDeliveryModuleQuery as ChildAreaDeliveryModuleQuery; use Thelia\Model\AreaQuery as ChildAreaQuery; -use Thelia\Model\Delivzone as ChildDelivzone; -use Thelia\Model\DelivzoneQuery as ChildDelivzoneQuery; -use Thelia\Model\Map\DelivzoneTableMap; +use Thelia\Model\Module as ChildModule; +use Thelia\Model\ModuleQuery as ChildModuleQuery; +use Thelia\Model\Map\AreaDeliveryModuleTableMap; -abstract class Delivzone implements ActiveRecordInterface +abstract class AreaDeliveryModule implements ActiveRecordInterface { /** * TableMap class name */ - const TABLE_MAP = '\\Thelia\\Model\\Map\\DelivzoneTableMap'; + const TABLE_MAP = '\\Thelia\\Model\\Map\\AreaDeliveryModuleTableMap'; /** @@ -69,10 +71,10 @@ abstract class Delivzone implements ActiveRecordInterface protected $area_id; /** - * The value for the delivery field. - * @var string + * The value for the delivery_module_id field. + * @var int */ - protected $delivery; + protected $delivery_module_id; /** * The value for the created_at field. @@ -91,6 +93,11 @@ abstract class Delivzone implements ActiveRecordInterface */ protected $aArea; + /** + * @var Module + */ + protected $aModule; + /** * Flag to prevent endless save loop, if this object is referenced * by another object which falls in this transaction. @@ -100,7 +107,7 @@ abstract class Delivzone implements ActiveRecordInterface protected $alreadyInSave = false; /** - * Initializes internal state of Thelia\Model\Base\Delivzone object. + * Initializes internal state of Thelia\Model\Base\AreaDeliveryModule object. */ public function __construct() { @@ -195,9 +202,9 @@ abstract class Delivzone implements ActiveRecordInterface } /** - * Compares this with another Delivzone instance. If - * obj is an instance of Delivzone, delegates to - * equals(Delivzone). Otherwise, returns false. + * Compares this with another AreaDeliveryModule instance. If + * obj is an instance of AreaDeliveryModule, delegates to + * equals(AreaDeliveryModule). Otherwise, returns false. * * @param obj The object to compare to. * @return Whether equal to the object specified. @@ -278,7 +285,7 @@ abstract class Delivzone implements ActiveRecordInterface * @param string $name The virtual column name * @param mixed $value The value to give to the virtual column * - * @return Delivzone The current object, for fluid interface + * @return AreaDeliveryModule The current object, for fluid interface */ public function setVirtualColumn($name, $value) { @@ -310,7 +317,7 @@ abstract class Delivzone implements ActiveRecordInterface * or a format name ('XML', 'YAML', 'JSON', 'CSV') * @param string $data The source data to import from * - * @return Delivzone The current object, for fluid interface + * @return AreaDeliveryModule The current object, for fluid interface */ public function importFrom($parser, $data) { @@ -376,14 +383,14 @@ abstract class Delivzone implements ActiveRecordInterface } /** - * Get the [delivery] column value. + * Get the [delivery_module_id] column value. * - * @return string + * @return int */ - public function getDelivery() + public function getDeliveryModuleId() { - return $this->delivery; + return $this->delivery_module_id; } /** @@ -430,7 +437,7 @@ abstract class Delivzone implements ActiveRecordInterface * Set the value of [id] column. * * @param int $v new value - * @return \Thelia\Model\Delivzone The current object (for fluent API support) + * @return \Thelia\Model\AreaDeliveryModule The current object (for fluent API support) */ public function setId($v) { @@ -440,7 +447,7 @@ abstract class Delivzone implements ActiveRecordInterface if ($this->id !== $v) { $this->id = $v; - $this->modifiedColumns[] = DelivzoneTableMap::ID; + $this->modifiedColumns[] = AreaDeliveryModuleTableMap::ID; } @@ -451,7 +458,7 @@ abstract class Delivzone implements ActiveRecordInterface * Set the value of [area_id] column. * * @param int $v new value - * @return \Thelia\Model\Delivzone The current object (for fluent API support) + * @return \Thelia\Model\AreaDeliveryModule The current object (for fluent API support) */ public function setAreaId($v) { @@ -461,7 +468,7 @@ abstract class Delivzone implements ActiveRecordInterface if ($this->area_id !== $v) { $this->area_id = $v; - $this->modifiedColumns[] = DelivzoneTableMap::AREA_ID; + $this->modifiedColumns[] = AreaDeliveryModuleTableMap::AREA_ID; } if ($this->aArea !== null && $this->aArea->getId() !== $v) { @@ -473,32 +480,36 @@ abstract class Delivzone implements ActiveRecordInterface } // setAreaId() /** - * Set the value of [delivery] column. + * Set the value of [delivery_module_id] column. * - * @param string $v new value - * @return \Thelia\Model\Delivzone The current object (for fluent API support) + * @param int $v new value + * @return \Thelia\Model\AreaDeliveryModule The current object (for fluent API support) */ - public function setDelivery($v) + public function setDeliveryModuleId($v) { if ($v !== null) { - $v = (string) $v; + $v = (int) $v; } - if ($this->delivery !== $v) { - $this->delivery = $v; - $this->modifiedColumns[] = DelivzoneTableMap::DELIVERY; + if ($this->delivery_module_id !== $v) { + $this->delivery_module_id = $v; + $this->modifiedColumns[] = AreaDeliveryModuleTableMap::DELIVERY_MODULE_ID; + } + + if ($this->aModule !== null && $this->aModule->getId() !== $v) { + $this->aModule = null; } return $this; - } // setDelivery() + } // setDeliveryModuleId() /** * 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 \Thelia\Model\Delivzone The current object (for fluent API support) + * @return \Thelia\Model\AreaDeliveryModule The current object (for fluent API support) */ public function setCreatedAt($v) { @@ -506,7 +517,7 @@ abstract class Delivzone implements ActiveRecordInterface if ($this->created_at !== null || $dt !== null) { if ($dt !== $this->created_at) { $this->created_at = $dt; - $this->modifiedColumns[] = DelivzoneTableMap::CREATED_AT; + $this->modifiedColumns[] = AreaDeliveryModuleTableMap::CREATED_AT; } } // if either are not null @@ -519,7 +530,7 @@ abstract class Delivzone implements ActiveRecordInterface * * @param mixed $v string, integer (timestamp), or \DateTime value. * Empty strings are treated as NULL. - * @return \Thelia\Model\Delivzone The current object (for fluent API support) + * @return \Thelia\Model\AreaDeliveryModule The current object (for fluent API support) */ public function setUpdatedAt($v) { @@ -527,7 +538,7 @@ abstract class Delivzone implements ActiveRecordInterface if ($this->updated_at !== null || $dt !== null) { if ($dt !== $this->updated_at) { $this->updated_at = $dt; - $this->modifiedColumns[] = DelivzoneTableMap::UPDATED_AT; + $this->modifiedColumns[] = AreaDeliveryModuleTableMap::UPDATED_AT; } } // if either are not null @@ -572,22 +583,22 @@ abstract class Delivzone implements ActiveRecordInterface try { - $col = $row[TableMap::TYPE_NUM == $indexType ? 0 + $startcol : DelivzoneTableMap::translateFieldName('Id', TableMap::TYPE_PHPNAME, $indexType)]; + $col = $row[TableMap::TYPE_NUM == $indexType ? 0 + $startcol : AreaDeliveryModuleTableMap::translateFieldName('Id', TableMap::TYPE_PHPNAME, $indexType)]; $this->id = (null !== $col) ? (int) $col : null; - $col = $row[TableMap::TYPE_NUM == $indexType ? 1 + $startcol : DelivzoneTableMap::translateFieldName('AreaId', TableMap::TYPE_PHPNAME, $indexType)]; + $col = $row[TableMap::TYPE_NUM == $indexType ? 1 + $startcol : AreaDeliveryModuleTableMap::translateFieldName('AreaId', TableMap::TYPE_PHPNAME, $indexType)]; $this->area_id = (null !== $col) ? (int) $col : null; - $col = $row[TableMap::TYPE_NUM == $indexType ? 2 + $startcol : DelivzoneTableMap::translateFieldName('Delivery', TableMap::TYPE_PHPNAME, $indexType)]; - $this->delivery = (null !== $col) ? (string) $col : null; + $col = $row[TableMap::TYPE_NUM == $indexType ? 2 + $startcol : AreaDeliveryModuleTableMap::translateFieldName('DeliveryModuleId', TableMap::TYPE_PHPNAME, $indexType)]; + $this->delivery_module_id = (null !== $col) ? (int) $col : null; - $col = $row[TableMap::TYPE_NUM == $indexType ? 3 + $startcol : DelivzoneTableMap::translateFieldName('CreatedAt', TableMap::TYPE_PHPNAME, $indexType)]; + $col = $row[TableMap::TYPE_NUM == $indexType ? 3 + $startcol : AreaDeliveryModuleTableMap::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 ? 4 + $startcol : DelivzoneTableMap::translateFieldName('UpdatedAt', TableMap::TYPE_PHPNAME, $indexType)]; + $col = $row[TableMap::TYPE_NUM == $indexType ? 4 + $startcol : AreaDeliveryModuleTableMap::translateFieldName('UpdatedAt', TableMap::TYPE_PHPNAME, $indexType)]; if ($col === '0000-00-00 00:00:00') { $col = null; } @@ -600,10 +611,10 @@ abstract class Delivzone implements ActiveRecordInterface $this->ensureConsistency(); } - return $startcol + 5; // 5 = DelivzoneTableMap::NUM_HYDRATE_COLUMNS. + return $startcol + 5; // 5 = AreaDeliveryModuleTableMap::NUM_HYDRATE_COLUMNS. } catch (Exception $e) { - throw new PropelException("Error populating \Thelia\Model\Delivzone object", 0, $e); + throw new PropelException("Error populating \Thelia\Model\AreaDeliveryModule object", 0, $e); } } @@ -625,6 +636,9 @@ abstract class Delivzone implements ActiveRecordInterface if ($this->aArea !== null && $this->area_id !== $this->aArea->getId()) { $this->aArea = null; } + if ($this->aModule !== null && $this->delivery_module_id !== $this->aModule->getId()) { + $this->aModule = null; + } } // ensureConsistency /** @@ -648,13 +662,13 @@ abstract class Delivzone implements ActiveRecordInterface } if ($con === null) { - $con = Propel::getServiceContainer()->getReadConnection(DelivzoneTableMap::DATABASE_NAME); + $con = Propel::getServiceContainer()->getReadConnection(AreaDeliveryModuleTableMap::DATABASE_NAME); } // We don't need to alter the object instance pool; we're just modifying this instance // already in the pool. - $dataFetcher = ChildDelivzoneQuery::create(null, $this->buildPkeyCriteria())->setFormatter(ModelCriteria::FORMAT_STATEMENT)->find($con); + $dataFetcher = ChildAreaDeliveryModuleQuery::create(null, $this->buildPkeyCriteria())->setFormatter(ModelCriteria::FORMAT_STATEMENT)->find($con); $row = $dataFetcher->fetch(); $dataFetcher->close(); if (!$row) { @@ -665,6 +679,7 @@ abstract class Delivzone implements ActiveRecordInterface if ($deep) { // also de-associate any related objects? $this->aArea = null; + $this->aModule = null; } // if (deep) } @@ -674,8 +689,8 @@ abstract class Delivzone implements ActiveRecordInterface * @param ConnectionInterface $con * @return void * @throws PropelException - * @see Delivzone::setDeleted() - * @see Delivzone::isDeleted() + * @see AreaDeliveryModule::setDeleted() + * @see AreaDeliveryModule::isDeleted() */ public function delete(ConnectionInterface $con = null) { @@ -684,12 +699,12 @@ abstract class Delivzone implements ActiveRecordInterface } if ($con === null) { - $con = Propel::getServiceContainer()->getWriteConnection(DelivzoneTableMap::DATABASE_NAME); + $con = Propel::getServiceContainer()->getWriteConnection(AreaDeliveryModuleTableMap::DATABASE_NAME); } $con->beginTransaction(); try { - $deleteQuery = ChildDelivzoneQuery::create() + $deleteQuery = ChildAreaDeliveryModuleQuery::create() ->filterByPrimaryKey($this->getPrimaryKey()); $ret = $this->preDelete($con); if ($ret) { @@ -726,7 +741,7 @@ abstract class Delivzone implements ActiveRecordInterface } if ($con === null) { - $con = Propel::getServiceContainer()->getWriteConnection(DelivzoneTableMap::DATABASE_NAME); + $con = Propel::getServiceContainer()->getWriteConnection(AreaDeliveryModuleTableMap::DATABASE_NAME); } $con->beginTransaction(); @@ -736,16 +751,16 @@ abstract class Delivzone implements ActiveRecordInterface if ($isInsert) { $ret = $ret && $this->preInsert($con); // timestampable behavior - if (!$this->isColumnModified(DelivzoneTableMap::CREATED_AT)) { + if (!$this->isColumnModified(AreaDeliveryModuleTableMap::CREATED_AT)) { $this->setCreatedAt(time()); } - if (!$this->isColumnModified(DelivzoneTableMap::UPDATED_AT)) { + if (!$this->isColumnModified(AreaDeliveryModuleTableMap::UPDATED_AT)) { $this->setUpdatedAt(time()); } } else { $ret = $ret && $this->preUpdate($con); // timestampable behavior - if ($this->isModified() && !$this->isColumnModified(DelivzoneTableMap::UPDATED_AT)) { + if ($this->isModified() && !$this->isColumnModified(AreaDeliveryModuleTableMap::UPDATED_AT)) { $this->setUpdatedAt(time()); } } @@ -757,7 +772,7 @@ abstract class Delivzone implements ActiveRecordInterface $this->postUpdate($con); } $this->postSave($con); - DelivzoneTableMap::addInstanceToPool($this); + AreaDeliveryModuleTableMap::addInstanceToPool($this); } else { $affectedRows = 0; } @@ -799,6 +814,13 @@ abstract class Delivzone implements ActiveRecordInterface $this->setArea($this->aArea); } + if ($this->aModule !== null) { + if ($this->aModule->isModified() || $this->aModule->isNew()) { + $affectedRows += $this->aModule->save($con); + } + $this->setModule($this->aModule); + } + if ($this->isNew() || $this->isModified()) { // persist changes if ($this->isNew()) { @@ -830,30 +852,30 @@ abstract class Delivzone implements ActiveRecordInterface $modifiedColumns = array(); $index = 0; - $this->modifiedColumns[] = DelivzoneTableMap::ID; + $this->modifiedColumns[] = AreaDeliveryModuleTableMap::ID; if (null !== $this->id) { - throw new PropelException('Cannot insert a value for auto-increment primary key (' . DelivzoneTableMap::ID . ')'); + throw new PropelException('Cannot insert a value for auto-increment primary key (' . AreaDeliveryModuleTableMap::ID . ')'); } // check the columns in natural order for more readable SQL queries - if ($this->isColumnModified(DelivzoneTableMap::ID)) { + if ($this->isColumnModified(AreaDeliveryModuleTableMap::ID)) { $modifiedColumns[':p' . $index++] = 'ID'; } - if ($this->isColumnModified(DelivzoneTableMap::AREA_ID)) { + if ($this->isColumnModified(AreaDeliveryModuleTableMap::AREA_ID)) { $modifiedColumns[':p' . $index++] = 'AREA_ID'; } - if ($this->isColumnModified(DelivzoneTableMap::DELIVERY)) { - $modifiedColumns[':p' . $index++] = 'DELIVERY'; + if ($this->isColumnModified(AreaDeliveryModuleTableMap::DELIVERY_MODULE_ID)) { + $modifiedColumns[':p' . $index++] = 'DELIVERY_MODULE_ID'; } - if ($this->isColumnModified(DelivzoneTableMap::CREATED_AT)) { + if ($this->isColumnModified(AreaDeliveryModuleTableMap::CREATED_AT)) { $modifiedColumns[':p' . $index++] = 'CREATED_AT'; } - if ($this->isColumnModified(DelivzoneTableMap::UPDATED_AT)) { + if ($this->isColumnModified(AreaDeliveryModuleTableMap::UPDATED_AT)) { $modifiedColumns[':p' . $index++] = 'UPDATED_AT'; } $sql = sprintf( - 'INSERT INTO delivzone (%s) VALUES (%s)', + 'INSERT INTO area_delivery_module (%s) VALUES (%s)', implode(', ', $modifiedColumns), implode(', ', array_keys($modifiedColumns)) ); @@ -868,8 +890,8 @@ abstract class Delivzone implements ActiveRecordInterface case 'AREA_ID': $stmt->bindValue($identifier, $this->area_id, PDO::PARAM_INT); break; - case 'DELIVERY': - $stmt->bindValue($identifier, $this->delivery, PDO::PARAM_STR); + case 'DELIVERY_MODULE_ID': + $stmt->bindValue($identifier, $this->delivery_module_id, 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); @@ -923,7 +945,7 @@ abstract class Delivzone implements ActiveRecordInterface */ public function getByName($name, $type = TableMap::TYPE_PHPNAME) { - $pos = DelivzoneTableMap::translateFieldName($name, $type, TableMap::TYPE_NUM); + $pos = AreaDeliveryModuleTableMap::translateFieldName($name, $type, TableMap::TYPE_NUM); $field = $this->getByPosition($pos); return $field; @@ -946,7 +968,7 @@ abstract class Delivzone implements ActiveRecordInterface return $this->getAreaId(); break; case 2: - return $this->getDelivery(); + return $this->getDeliveryModuleId(); break; case 3: return $this->getCreatedAt(); @@ -977,15 +999,15 @@ abstract class Delivzone implements ActiveRecordInterface */ public function toArray($keyType = TableMap::TYPE_PHPNAME, $includeLazyLoadColumns = true, $alreadyDumpedObjects = array(), $includeForeignObjects = false) { - if (isset($alreadyDumpedObjects['Delivzone'][$this->getPrimaryKey()])) { + if (isset($alreadyDumpedObjects['AreaDeliveryModule'][$this->getPrimaryKey()])) { return '*RECURSION*'; } - $alreadyDumpedObjects['Delivzone'][$this->getPrimaryKey()] = true; - $keys = DelivzoneTableMap::getFieldNames($keyType); + $alreadyDumpedObjects['AreaDeliveryModule'][$this->getPrimaryKey()] = true; + $keys = AreaDeliveryModuleTableMap::getFieldNames($keyType); $result = array( $keys[0] => $this->getId(), $keys[1] => $this->getAreaId(), - $keys[2] => $this->getDelivery(), + $keys[2] => $this->getDeliveryModuleId(), $keys[3] => $this->getCreatedAt(), $keys[4] => $this->getUpdatedAt(), ); @@ -999,6 +1021,9 @@ abstract class Delivzone implements ActiveRecordInterface if (null !== $this->aArea) { $result['Area'] = $this->aArea->toArray($keyType, $includeLazyLoadColumns, $alreadyDumpedObjects, true); } + if (null !== $this->aModule) { + $result['Module'] = $this->aModule->toArray($keyType, $includeLazyLoadColumns, $alreadyDumpedObjects, true); + } } return $result; @@ -1017,7 +1042,7 @@ abstract class Delivzone implements ActiveRecordInterface */ public function setByName($name, $value, $type = TableMap::TYPE_PHPNAME) { - $pos = DelivzoneTableMap::translateFieldName($name, $type, TableMap::TYPE_NUM); + $pos = AreaDeliveryModuleTableMap::translateFieldName($name, $type, TableMap::TYPE_NUM); return $this->setByPosition($pos, $value); } @@ -1040,7 +1065,7 @@ abstract class Delivzone implements ActiveRecordInterface $this->setAreaId($value); break; case 2: - $this->setDelivery($value); + $this->setDeliveryModuleId($value); break; case 3: $this->setCreatedAt($value); @@ -1070,11 +1095,11 @@ abstract class Delivzone implements ActiveRecordInterface */ public function fromArray($arr, $keyType = TableMap::TYPE_PHPNAME) { - $keys = DelivzoneTableMap::getFieldNames($keyType); + $keys = AreaDeliveryModuleTableMap::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->setDelivery($arr[$keys[2]]); + if (array_key_exists($keys[2], $arr)) $this->setDeliveryModuleId($arr[$keys[2]]); if (array_key_exists($keys[3], $arr)) $this->setCreatedAt($arr[$keys[3]]); if (array_key_exists($keys[4], $arr)) $this->setUpdatedAt($arr[$keys[4]]); } @@ -1086,13 +1111,13 @@ abstract class Delivzone implements ActiveRecordInterface */ public function buildCriteria() { - $criteria = new Criteria(DelivzoneTableMap::DATABASE_NAME); + $criteria = new Criteria(AreaDeliveryModuleTableMap::DATABASE_NAME); - if ($this->isColumnModified(DelivzoneTableMap::ID)) $criteria->add(DelivzoneTableMap::ID, $this->id); - if ($this->isColumnModified(DelivzoneTableMap::AREA_ID)) $criteria->add(DelivzoneTableMap::AREA_ID, $this->area_id); - if ($this->isColumnModified(DelivzoneTableMap::DELIVERY)) $criteria->add(DelivzoneTableMap::DELIVERY, $this->delivery); - if ($this->isColumnModified(DelivzoneTableMap::CREATED_AT)) $criteria->add(DelivzoneTableMap::CREATED_AT, $this->created_at); - if ($this->isColumnModified(DelivzoneTableMap::UPDATED_AT)) $criteria->add(DelivzoneTableMap::UPDATED_AT, $this->updated_at); + if ($this->isColumnModified(AreaDeliveryModuleTableMap::ID)) $criteria->add(AreaDeliveryModuleTableMap::ID, $this->id); + if ($this->isColumnModified(AreaDeliveryModuleTableMap::AREA_ID)) $criteria->add(AreaDeliveryModuleTableMap::AREA_ID, $this->area_id); + if ($this->isColumnModified(AreaDeliveryModuleTableMap::DELIVERY_MODULE_ID)) $criteria->add(AreaDeliveryModuleTableMap::DELIVERY_MODULE_ID, $this->delivery_module_id); + if ($this->isColumnModified(AreaDeliveryModuleTableMap::CREATED_AT)) $criteria->add(AreaDeliveryModuleTableMap::CREATED_AT, $this->created_at); + if ($this->isColumnModified(AreaDeliveryModuleTableMap::UPDATED_AT)) $criteria->add(AreaDeliveryModuleTableMap::UPDATED_AT, $this->updated_at); return $criteria; } @@ -1107,8 +1132,8 @@ abstract class Delivzone implements ActiveRecordInterface */ public function buildPkeyCriteria() { - $criteria = new Criteria(DelivzoneTableMap::DATABASE_NAME); - $criteria->add(DelivzoneTableMap::ID, $this->id); + $criteria = new Criteria(AreaDeliveryModuleTableMap::DATABASE_NAME); + $criteria->add(AreaDeliveryModuleTableMap::ID, $this->id); return $criteria; } @@ -1149,7 +1174,7 @@ abstract class Delivzone implements ActiveRecordInterface * If desired, this method can also make copies of all associated (fkey referrers) * objects. * - * @param object $copyObj An object of \Thelia\Model\Delivzone (or compatible) type. + * @param object $copyObj An object of \Thelia\Model\AreaDeliveryModule (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 @@ -1157,7 +1182,7 @@ abstract class Delivzone implements ActiveRecordInterface public function copyInto($copyObj, $deepCopy = false, $makeNew = true) { $copyObj->setAreaId($this->getAreaId()); - $copyObj->setDelivery($this->getDelivery()); + $copyObj->setDeliveryModuleId($this->getDeliveryModuleId()); $copyObj->setCreatedAt($this->getCreatedAt()); $copyObj->setUpdatedAt($this->getUpdatedAt()); if ($makeNew) { @@ -1175,7 +1200,7 @@ abstract class Delivzone implements ActiveRecordInterface * objects. * * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. - * @return \Thelia\Model\Delivzone Clone of current object. + * @return \Thelia\Model\AreaDeliveryModule Clone of current object. * @throws PropelException */ public function copy($deepCopy = false) @@ -1192,7 +1217,7 @@ abstract class Delivzone implements ActiveRecordInterface * Declares an association between this object and a ChildArea object. * * @param ChildArea $v - * @return \Thelia\Model\Delivzone The current object (for fluent API support) + * @return \Thelia\Model\AreaDeliveryModule The current object (for fluent API support) * @throws PropelException */ public function setArea(ChildArea $v = null) @@ -1208,7 +1233,7 @@ abstract class Delivzone implements ActiveRecordInterface // 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->addDelivzone($this); + $v->addAreaDeliveryModule($this); } @@ -1232,13 +1257,64 @@ abstract class Delivzone implements ActiveRecordInterface 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->addDelivzones($this); + $this->aArea->addAreaDeliveryModules($this); */ } return $this->aArea; } + /** + * Declares an association between this object and a ChildModule object. + * + * @param ChildModule $v + * @return \Thelia\Model\AreaDeliveryModule The current object (for fluent API support) + * @throws PropelException + */ + public function setModule(ChildModule $v = null) + { + if ($v === null) { + $this->setDeliveryModuleId(NULL); + } else { + $this->setDeliveryModuleId($v->getId()); + } + + $this->aModule = $v; + + // Add binding for other direction of this n:n relationship. + // If this object has already been added to the ChildModule object, it will not be re-added. + if ($v !== null) { + $v->addAreaDeliveryModule($this); + } + + + return $this; + } + + + /** + * Get the associated ChildModule object + * + * @param ConnectionInterface $con Optional Connection object. + * @return ChildModule The associated ChildModule object. + * @throws PropelException + */ + public function getModule(ConnectionInterface $con = null) + { + if ($this->aModule === null && ($this->delivery_module_id !== null)) { + $this->aModule = ChildModuleQuery::create()->findPk($this->delivery_module_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->aModule->addAreaDeliveryModules($this); + */ + } + + return $this->aModule; + } + /** * Clears the current object and sets all attributes to their default values */ @@ -1246,7 +1322,7 @@ abstract class Delivzone implements ActiveRecordInterface { $this->id = null; $this->area_id = null; - $this->delivery = null; + $this->delivery_module_id = null; $this->created_at = null; $this->updated_at = null; $this->alreadyInSave = false; @@ -1271,6 +1347,7 @@ abstract class Delivzone implements ActiveRecordInterface } // if ($deep) $this->aArea = null; + $this->aModule = null; } /** @@ -1280,7 +1357,7 @@ abstract class Delivzone implements ActiveRecordInterface */ public function __toString() { - return (string) $this->exportTo(DelivzoneTableMap::DEFAULT_STRING_FORMAT); + return (string) $this->exportTo(AreaDeliveryModuleTableMap::DEFAULT_STRING_FORMAT); } // timestampable behavior @@ -1288,11 +1365,11 @@ abstract class Delivzone implements ActiveRecordInterface /** * Mark the current object so that the update date doesn't get updated during next save * - * @return ChildDelivzone The current object (for fluent API support) + * @return ChildAreaDeliveryModule The current object (for fluent API support) */ public function keepUpdateDateUnchanged() { - $this->modifiedColumns[] = DelivzoneTableMap::UPDATED_AT; + $this->modifiedColumns[] = AreaDeliveryModuleTableMap::UPDATED_AT; return $this; } diff --git a/core/lib/Thelia/Model/Base/DelivzoneQuery.php b/core/lib/Thelia/Model/Base/AreaDeliveryModuleQuery.php similarity index 53% rename from core/lib/Thelia/Model/Base/DelivzoneQuery.php rename to core/lib/Thelia/Model/Base/AreaDeliveryModuleQuery.php index e4b8a8ab5..394fe651e 100644 --- a/core/lib/Thelia/Model/Base/DelivzoneQuery.php +++ b/core/lib/Thelia/Model/Base/AreaDeliveryModuleQuery.php @@ -12,80 +12,84 @@ use Propel\Runtime\Collection\Collection; use Propel\Runtime\Collection\ObjectCollection; use Propel\Runtime\Connection\ConnectionInterface; use Propel\Runtime\Exception\PropelException; -use Thelia\Model\Delivzone as ChildDelivzone; -use Thelia\Model\DelivzoneQuery as ChildDelivzoneQuery; -use Thelia\Model\Map\DelivzoneTableMap; +use Thelia\Model\AreaDeliveryModule as ChildAreaDeliveryModule; +use Thelia\Model\AreaDeliveryModuleQuery as ChildAreaDeliveryModuleQuery; +use Thelia\Model\Map\AreaDeliveryModuleTableMap; /** - * Base class that represents a query for the 'delivzone' table. + * Base class that represents a query for the 'area_delivery_module' table. * * * - * @method ChildDelivzoneQuery orderById($order = Criteria::ASC) Order by the id column - * @method ChildDelivzoneQuery orderByAreaId($order = Criteria::ASC) Order by the area_id column - * @method ChildDelivzoneQuery orderByDelivery($order = Criteria::ASC) Order by the delivery column - * @method ChildDelivzoneQuery orderByCreatedAt($order = Criteria::ASC) Order by the created_at column - * @method ChildDelivzoneQuery orderByUpdatedAt($order = Criteria::ASC) Order by the updated_at column + * @method ChildAreaDeliveryModuleQuery orderById($order = Criteria::ASC) Order by the id column + * @method ChildAreaDeliveryModuleQuery orderByAreaId($order = Criteria::ASC) Order by the area_id column + * @method ChildAreaDeliveryModuleQuery orderByDeliveryModuleId($order = Criteria::ASC) Order by the delivery_module_id column + * @method ChildAreaDeliveryModuleQuery orderByCreatedAt($order = Criteria::ASC) Order by the created_at column + * @method ChildAreaDeliveryModuleQuery orderByUpdatedAt($order = Criteria::ASC) Order by the updated_at column * - * @method ChildDelivzoneQuery groupById() Group by the id column - * @method ChildDelivzoneQuery groupByAreaId() Group by the area_id column - * @method ChildDelivzoneQuery groupByDelivery() Group by the delivery column - * @method ChildDelivzoneQuery groupByCreatedAt() Group by the created_at column - * @method ChildDelivzoneQuery groupByUpdatedAt() Group by the updated_at column + * @method ChildAreaDeliveryModuleQuery groupById() Group by the id column + * @method ChildAreaDeliveryModuleQuery groupByAreaId() Group by the area_id column + * @method ChildAreaDeliveryModuleQuery groupByDeliveryModuleId() Group by the delivery_module_id column + * @method ChildAreaDeliveryModuleQuery groupByCreatedAt() Group by the created_at column + * @method ChildAreaDeliveryModuleQuery groupByUpdatedAt() Group by the updated_at column * - * @method ChildDelivzoneQuery leftJoin($relation) Adds a LEFT JOIN clause to the query - * @method ChildDelivzoneQuery rightJoin($relation) Adds a RIGHT JOIN clause to the query - * @method ChildDelivzoneQuery innerJoin($relation) Adds a INNER JOIN clause to the query + * @method ChildAreaDeliveryModuleQuery leftJoin($relation) Adds a LEFT JOIN clause to the query + * @method ChildAreaDeliveryModuleQuery rightJoin($relation) Adds a RIGHT JOIN clause to the query + * @method ChildAreaDeliveryModuleQuery innerJoin($relation) Adds a INNER JOIN clause to the query * - * @method ChildDelivzoneQuery leftJoinArea($relationAlias = null) Adds a LEFT JOIN clause to the query using the Area relation - * @method ChildDelivzoneQuery rightJoinArea($relationAlias = null) Adds a RIGHT JOIN clause to the query using the Area relation - * @method ChildDelivzoneQuery innerJoinArea($relationAlias = null) Adds a INNER JOIN clause to the query using the Area relation + * @method ChildAreaDeliveryModuleQuery leftJoinArea($relationAlias = null) Adds a LEFT JOIN clause to the query using the Area relation + * @method ChildAreaDeliveryModuleQuery rightJoinArea($relationAlias = null) Adds a RIGHT JOIN clause to the query using the Area relation + * @method ChildAreaDeliveryModuleQuery innerJoinArea($relationAlias = null) Adds a INNER JOIN clause to the query using the Area relation * - * @method ChildDelivzone findOne(ConnectionInterface $con = null) Return the first ChildDelivzone matching the query - * @method ChildDelivzone findOneOrCreate(ConnectionInterface $con = null) Return the first ChildDelivzone matching the query, or a new ChildDelivzone object populated from the query conditions when no match is found + * @method ChildAreaDeliveryModuleQuery leftJoinModule($relationAlias = null) Adds a LEFT JOIN clause to the query using the Module relation + * @method ChildAreaDeliveryModuleQuery rightJoinModule($relationAlias = null) Adds a RIGHT JOIN clause to the query using the Module relation + * @method ChildAreaDeliveryModuleQuery innerJoinModule($relationAlias = null) Adds a INNER JOIN clause to the query using the Module relation * - * @method ChildDelivzone findOneById(int $id) Return the first ChildDelivzone filtered by the id column - * @method ChildDelivzone findOneByAreaId(int $area_id) Return the first ChildDelivzone filtered by the area_id column - * @method ChildDelivzone findOneByDelivery(string $delivery) Return the first ChildDelivzone filtered by the delivery column - * @method ChildDelivzone findOneByCreatedAt(string $created_at) Return the first ChildDelivzone filtered by the created_at column - * @method ChildDelivzone findOneByUpdatedAt(string $updated_at) Return the first ChildDelivzone filtered by the updated_at column + * @method ChildAreaDeliveryModule findOne(ConnectionInterface $con = null) Return the first ChildAreaDeliveryModule matching the query + * @method ChildAreaDeliveryModule findOneOrCreate(ConnectionInterface $con = null) Return the first ChildAreaDeliveryModule matching the query, or a new ChildAreaDeliveryModule object populated from the query conditions when no match is found * - * @method array findById(int $id) Return ChildDelivzone objects filtered by the id column - * @method array findByAreaId(int $area_id) Return ChildDelivzone objects filtered by the area_id column - * @method array findByDelivery(string $delivery) Return ChildDelivzone objects filtered by the delivery column - * @method array findByCreatedAt(string $created_at) Return ChildDelivzone objects filtered by the created_at column - * @method array findByUpdatedAt(string $updated_at) Return ChildDelivzone objects filtered by the updated_at column + * @method ChildAreaDeliveryModule findOneById(int $id) Return the first ChildAreaDeliveryModule filtered by the id column + * @method ChildAreaDeliveryModule findOneByAreaId(int $area_id) Return the first ChildAreaDeliveryModule filtered by the area_id column + * @method ChildAreaDeliveryModule findOneByDeliveryModuleId(int $delivery_module_id) Return the first ChildAreaDeliveryModule filtered by the delivery_module_id column + * @method ChildAreaDeliveryModule findOneByCreatedAt(string $created_at) Return the first ChildAreaDeliveryModule filtered by the created_at column + * @method ChildAreaDeliveryModule findOneByUpdatedAt(string $updated_at) Return the first ChildAreaDeliveryModule filtered by the updated_at column + * + * @method array findById(int $id) Return ChildAreaDeliveryModule objects filtered by the id column + * @method array findByAreaId(int $area_id) Return ChildAreaDeliveryModule objects filtered by the area_id column + * @method array findByDeliveryModuleId(int $delivery_module_id) Return ChildAreaDeliveryModule objects filtered by the delivery_module_id column + * @method array findByCreatedAt(string $created_at) Return ChildAreaDeliveryModule objects filtered by the created_at column + * @method array findByUpdatedAt(string $updated_at) Return ChildAreaDeliveryModule objects filtered by the updated_at column * */ -abstract class DelivzoneQuery extends ModelCriteria +abstract class AreaDeliveryModuleQuery extends ModelCriteria { /** - * Initializes internal state of \Thelia\Model\Base\DelivzoneQuery object. + * Initializes internal state of \Thelia\Model\Base\AreaDeliveryModuleQuery object. * * @param string $dbName The database name * @param string $modelName The phpName of a model, e.g. 'Book' * @param string $modelAlias The alias for the model in this query, e.g. 'b' */ - public function __construct($dbName = 'thelia', $modelName = '\\Thelia\\Model\\Delivzone', $modelAlias = null) + public function __construct($dbName = 'thelia', $modelName = '\\Thelia\\Model\\AreaDeliveryModule', $modelAlias = null) { parent::__construct($dbName, $modelName, $modelAlias); } /** - * Returns a new ChildDelivzoneQuery object. + * Returns a new ChildAreaDeliveryModuleQuery object. * * @param string $modelAlias The alias of a model in the query * @param Criteria $criteria Optional Criteria to build the query from * - * @return ChildDelivzoneQuery + * @return ChildAreaDeliveryModuleQuery */ public static function create($modelAlias = null, $criteria = null) { - if ($criteria instanceof \Thelia\Model\DelivzoneQuery) { + if ($criteria instanceof \Thelia\Model\AreaDeliveryModuleQuery) { return $criteria; } - $query = new \Thelia\Model\DelivzoneQuery(); + $query = new \Thelia\Model\AreaDeliveryModuleQuery(); if (null !== $modelAlias) { $query->setModelAlias($modelAlias); } @@ -108,19 +112,19 @@ abstract class DelivzoneQuery extends ModelCriteria * @param mixed $key Primary key to use for the query * @param ConnectionInterface $con an optional connection object * - * @return ChildDelivzone|array|mixed the result, formatted by the current formatter + * @return ChildAreaDeliveryModule|array|mixed the result, formatted by the current formatter */ public function findPk($key, $con = null) { if ($key === null) { return null; } - if ((null !== ($obj = DelivzoneTableMap::getInstanceFromPool((string) $key))) && !$this->formatter) { + if ((null !== ($obj = AreaDeliveryModuleTableMap::getInstanceFromPool((string) $key))) && !$this->formatter) { // the object is already in the instance pool return $obj; } if ($con === null) { - $con = Propel::getServiceContainer()->getReadConnection(DelivzoneTableMap::DATABASE_NAME); + $con = Propel::getServiceContainer()->getReadConnection(AreaDeliveryModuleTableMap::DATABASE_NAME); } $this->basePreSelect($con); if ($this->formatter || $this->modelAlias || $this->with || $this->select @@ -139,11 +143,11 @@ abstract class DelivzoneQuery extends ModelCriteria * @param mixed $key Primary key to use for the query * @param ConnectionInterface $con A connection object * - * @return ChildDelivzone A model object, or null if the key is not found + * @return ChildAreaDeliveryModule A model object, or null if the key is not found */ protected function findPkSimple($key, $con) { - $sql = 'SELECT ID, AREA_ID, DELIVERY, CREATED_AT, UPDATED_AT FROM delivzone WHERE ID = :p0'; + $sql = 'SELECT ID, AREA_ID, DELIVERY_MODULE_ID, CREATED_AT, UPDATED_AT FROM area_delivery_module WHERE ID = :p0'; try { $stmt = $con->prepare($sql); $stmt->bindValue(':p0', $key, PDO::PARAM_INT); @@ -154,9 +158,9 @@ abstract class DelivzoneQuery extends ModelCriteria } $obj = null; if ($row = $stmt->fetch(\PDO::FETCH_NUM)) { - $obj = new ChildDelivzone(); + $obj = new ChildAreaDeliveryModule(); $obj->hydrate($row); - DelivzoneTableMap::addInstanceToPool($obj, (string) $key); + AreaDeliveryModuleTableMap::addInstanceToPool($obj, (string) $key); } $stmt->closeCursor(); @@ -169,7 +173,7 @@ abstract class DelivzoneQuery extends ModelCriteria * @param mixed $key Primary key to use for the query * @param ConnectionInterface $con A connection object * - * @return ChildDelivzone|array|mixed the result, formatted by the current formatter + * @return ChildAreaDeliveryModule|array|mixed the result, formatted by the current formatter */ protected function findPkComplex($key, $con) { @@ -211,12 +215,12 @@ abstract class DelivzoneQuery extends ModelCriteria * * @param mixed $key Primary key to use for the query * - * @return ChildDelivzoneQuery The current query, for fluid interface + * @return ChildAreaDeliveryModuleQuery The current query, for fluid interface */ public function filterByPrimaryKey($key) { - return $this->addUsingAlias(DelivzoneTableMap::ID, $key, Criteria::EQUAL); + return $this->addUsingAlias(AreaDeliveryModuleTableMap::ID, $key, Criteria::EQUAL); } /** @@ -224,12 +228,12 @@ abstract class DelivzoneQuery extends ModelCriteria * * @param array $keys The list of primary key to use for the query * - * @return ChildDelivzoneQuery The current query, for fluid interface + * @return ChildAreaDeliveryModuleQuery The current query, for fluid interface */ public function filterByPrimaryKeys($keys) { - return $this->addUsingAlias(DelivzoneTableMap::ID, $keys, Criteria::IN); + return $this->addUsingAlias(AreaDeliveryModuleTableMap::ID, $keys, Criteria::IN); } /** @@ -248,18 +252,18 @@ abstract class DelivzoneQuery extends ModelCriteria * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * - * @return ChildDelivzoneQuery The current query, for fluid interface + * @return ChildAreaDeliveryModuleQuery 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(DelivzoneTableMap::ID, $id['min'], Criteria::GREATER_EQUAL); + $this->addUsingAlias(AreaDeliveryModuleTableMap::ID, $id['min'], Criteria::GREATER_EQUAL); $useMinMax = true; } if (isset($id['max'])) { - $this->addUsingAlias(DelivzoneTableMap::ID, $id['max'], Criteria::LESS_EQUAL); + $this->addUsingAlias(AreaDeliveryModuleTableMap::ID, $id['max'], Criteria::LESS_EQUAL); $useMinMax = true; } if ($useMinMax) { @@ -270,7 +274,7 @@ abstract class DelivzoneQuery extends ModelCriteria } } - return $this->addUsingAlias(DelivzoneTableMap::ID, $id, $comparison); + return $this->addUsingAlias(AreaDeliveryModuleTableMap::ID, $id, $comparison); } /** @@ -291,18 +295,18 @@ abstract class DelivzoneQuery extends ModelCriteria * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * - * @return ChildDelivzoneQuery The current query, for fluid interface + * @return ChildAreaDeliveryModuleQuery 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(DelivzoneTableMap::AREA_ID, $areaId['min'], Criteria::GREATER_EQUAL); + $this->addUsingAlias(AreaDeliveryModuleTableMap::AREA_ID, $areaId['min'], Criteria::GREATER_EQUAL); $useMinMax = true; } if (isset($areaId['max'])) { - $this->addUsingAlias(DelivzoneTableMap::AREA_ID, $areaId['max'], Criteria::LESS_EQUAL); + $this->addUsingAlias(AreaDeliveryModuleTableMap::AREA_ID, $areaId['max'], Criteria::LESS_EQUAL); $useMinMax = true; } if ($useMinMax) { @@ -313,36 +317,50 @@ abstract class DelivzoneQuery extends ModelCriteria } } - return $this->addUsingAlias(DelivzoneTableMap::AREA_ID, $areaId, $comparison); + return $this->addUsingAlias(AreaDeliveryModuleTableMap::AREA_ID, $areaId, $comparison); } /** - * Filter the query on the delivery column + * Filter the query on the delivery_module_id column * * Example usage: * - * $query->filterByDelivery('fooValue'); // WHERE delivery = 'fooValue' - * $query->filterByDelivery('%fooValue%'); // WHERE delivery LIKE '%fooValue%' + * $query->filterByDeliveryModuleId(1234); // WHERE delivery_module_id = 1234 + * $query->filterByDeliveryModuleId(array(12, 34)); // WHERE delivery_module_id IN (12, 34) + * $query->filterByDeliveryModuleId(array('min' => 12)); // WHERE delivery_module_id > 12 * * - * @param string $delivery The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) + * @see filterByModule() + * + * @param mixed $deliveryModuleId 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 ChildDelivzoneQuery The current query, for fluid interface + * @return ChildAreaDeliveryModuleQuery The current query, for fluid interface */ - public function filterByDelivery($delivery = null, $comparison = null) + public function filterByDeliveryModuleId($deliveryModuleId = null, $comparison = null) { - if (null === $comparison) { - if (is_array($delivery)) { + if (is_array($deliveryModuleId)) { + $useMinMax = false; + if (isset($deliveryModuleId['min'])) { + $this->addUsingAlias(AreaDeliveryModuleTableMap::DELIVERY_MODULE_ID, $deliveryModuleId['min'], Criteria::GREATER_EQUAL); + $useMinMax = true; + } + if (isset($deliveryModuleId['max'])) { + $this->addUsingAlias(AreaDeliveryModuleTableMap::DELIVERY_MODULE_ID, $deliveryModuleId['max'], Criteria::LESS_EQUAL); + $useMinMax = true; + } + if ($useMinMax) { + return $this; + } + if (null === $comparison) { $comparison = Criteria::IN; - } elseif (preg_match('/[\%\*]/', $delivery)) { - $delivery = str_replace('*', '%', $delivery); - $comparison = Criteria::LIKE; } } - return $this->addUsingAlias(DelivzoneTableMap::DELIVERY, $delivery, $comparison); + return $this->addUsingAlias(AreaDeliveryModuleTableMap::DELIVERY_MODULE_ID, $deliveryModuleId, $comparison); } /** @@ -363,18 +381,18 @@ abstract class DelivzoneQuery extends ModelCriteria * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * - * @return ChildDelivzoneQuery The current query, for fluid interface + * @return ChildAreaDeliveryModuleQuery 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(DelivzoneTableMap::CREATED_AT, $createdAt['min'], Criteria::GREATER_EQUAL); + $this->addUsingAlias(AreaDeliveryModuleTableMap::CREATED_AT, $createdAt['min'], Criteria::GREATER_EQUAL); $useMinMax = true; } if (isset($createdAt['max'])) { - $this->addUsingAlias(DelivzoneTableMap::CREATED_AT, $createdAt['max'], Criteria::LESS_EQUAL); + $this->addUsingAlias(AreaDeliveryModuleTableMap::CREATED_AT, $createdAt['max'], Criteria::LESS_EQUAL); $useMinMax = true; } if ($useMinMax) { @@ -385,7 +403,7 @@ abstract class DelivzoneQuery extends ModelCriteria } } - return $this->addUsingAlias(DelivzoneTableMap::CREATED_AT, $createdAt, $comparison); + return $this->addUsingAlias(AreaDeliveryModuleTableMap::CREATED_AT, $createdAt, $comparison); } /** @@ -406,18 +424,18 @@ abstract class DelivzoneQuery extends ModelCriteria * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * - * @return ChildDelivzoneQuery The current query, for fluid interface + * @return ChildAreaDeliveryModuleQuery 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(DelivzoneTableMap::UPDATED_AT, $updatedAt['min'], Criteria::GREATER_EQUAL); + $this->addUsingAlias(AreaDeliveryModuleTableMap::UPDATED_AT, $updatedAt['min'], Criteria::GREATER_EQUAL); $useMinMax = true; } if (isset($updatedAt['max'])) { - $this->addUsingAlias(DelivzoneTableMap::UPDATED_AT, $updatedAt['max'], Criteria::LESS_EQUAL); + $this->addUsingAlias(AreaDeliveryModuleTableMap::UPDATED_AT, $updatedAt['max'], Criteria::LESS_EQUAL); $useMinMax = true; } if ($useMinMax) { @@ -428,7 +446,7 @@ abstract class DelivzoneQuery extends ModelCriteria } } - return $this->addUsingAlias(DelivzoneTableMap::UPDATED_AT, $updatedAt, $comparison); + return $this->addUsingAlias(AreaDeliveryModuleTableMap::UPDATED_AT, $updatedAt, $comparison); } /** @@ -437,20 +455,20 @@ abstract class DelivzoneQuery extends ModelCriteria * @param \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 ChildDelivzoneQuery The current query, for fluid interface + * @return ChildAreaDeliveryModuleQuery The current query, for fluid interface */ public function filterByArea($area, $comparison = null) { if ($area instanceof \Thelia\Model\Area) { return $this - ->addUsingAlias(DelivzoneTableMap::AREA_ID, $area->getId(), $comparison); + ->addUsingAlias(AreaDeliveryModuleTableMap::AREA_ID, $area->getId(), $comparison); } elseif ($area instanceof ObjectCollection) { if (null === $comparison) { $comparison = Criteria::IN; } return $this - ->addUsingAlias(DelivzoneTableMap::AREA_ID, $area->toKeyValue('PrimaryKey', 'Id'), $comparison); + ->addUsingAlias(AreaDeliveryModuleTableMap::AREA_ID, $area->toKeyValue('PrimaryKey', 'Id'), $comparison); } else { throw new PropelException('filterByArea() only accepts arguments of type \Thelia\Model\Area or Collection'); } @@ -462,9 +480,9 @@ abstract class DelivzoneQuery extends ModelCriteria * @param string $relationAlias optional alias for the relation * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * - * @return ChildDelivzoneQuery The current query, for fluid interface + * @return ChildAreaDeliveryModuleQuery The current query, for fluid interface */ - public function joinArea($relationAlias = null, $joinType = Criteria::LEFT_JOIN) + public function joinArea($relationAlias = null, $joinType = Criteria::INNER_JOIN) { $tableMap = $this->getTableMap(); $relationMap = $tableMap->getRelation('Area'); @@ -499,7 +517,7 @@ abstract class DelivzoneQuery extends ModelCriteria * * @return \Thelia\Model\AreaQuery A secondary query class using the current class as primary query */ - public function useAreaQuery($relationAlias = null, $joinType = Criteria::LEFT_JOIN) + public function useAreaQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN) { return $this ->joinArea($relationAlias, $joinType) @@ -507,23 +525,98 @@ abstract class DelivzoneQuery extends ModelCriteria } /** - * Exclude object from result + * Filter the query by a related \Thelia\Model\Module object * - * @param ChildDelivzone $delivzone Object to remove from the list of results + * @param \Thelia\Model\Module|ObjectCollection $module The related object(s) to use as filter + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * - * @return ChildDelivzoneQuery The current query, for fluid interface + * @return ChildAreaDeliveryModuleQuery The current query, for fluid interface */ - public function prune($delivzone = null) + public function filterByModule($module, $comparison = null) { - if ($delivzone) { - $this->addUsingAlias(DelivzoneTableMap::ID, $delivzone->getId(), Criteria::NOT_EQUAL); + if ($module instanceof \Thelia\Model\Module) { + return $this + ->addUsingAlias(AreaDeliveryModuleTableMap::DELIVERY_MODULE_ID, $module->getId(), $comparison); + } elseif ($module instanceof ObjectCollection) { + if (null === $comparison) { + $comparison = Criteria::IN; + } + + return $this + ->addUsingAlias(AreaDeliveryModuleTableMap::DELIVERY_MODULE_ID, $module->toKeyValue('PrimaryKey', 'Id'), $comparison); + } else { + throw new PropelException('filterByModule() only accepts arguments of type \Thelia\Model\Module or Collection'); + } + } + + /** + * Adds a JOIN clause to the query using the Module relation + * + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * + * @return ChildAreaDeliveryModuleQuery The current query, for fluid interface + */ + public function joinModule($relationAlias = null, $joinType = Criteria::INNER_JOIN) + { + $tableMap = $this->getTableMap(); + $relationMap = $tableMap->getRelation('Module'); + + // 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, 'Module'); } return $this; } /** - * Deletes all rows from the delivzone table. + * Use the Module relation Module 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 \Thelia\Model\ModuleQuery A secondary query class using the current class as primary query + */ + public function useModuleQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN) + { + return $this + ->joinModule($relationAlias, $joinType) + ->useQuery($relationAlias ? $relationAlias : 'Module', '\Thelia\Model\ModuleQuery'); + } + + /** + * Exclude object from result + * + * @param ChildAreaDeliveryModule $areaDeliveryModule Object to remove from the list of results + * + * @return ChildAreaDeliveryModuleQuery The current query, for fluid interface + */ + public function prune($areaDeliveryModule = null) + { + if ($areaDeliveryModule) { + $this->addUsingAlias(AreaDeliveryModuleTableMap::ID, $areaDeliveryModule->getId(), Criteria::NOT_EQUAL); + } + + return $this; + } + + /** + * Deletes all rows from the area_delivery_module table. * * @param ConnectionInterface $con the connection to use * @return int The number of affected rows (if supported by underlying database driver). @@ -531,7 +624,7 @@ abstract class DelivzoneQuery extends ModelCriteria public function doDeleteAll(ConnectionInterface $con = null) { if (null === $con) { - $con = Propel::getServiceContainer()->getWriteConnection(DelivzoneTableMap::DATABASE_NAME); + $con = Propel::getServiceContainer()->getWriteConnection(AreaDeliveryModuleTableMap::DATABASE_NAME); } $affectedRows = 0; // initialize var to track total num of affected rows try { @@ -542,8 +635,8 @@ abstract class DelivzoneQuery extends ModelCriteria // 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). - DelivzoneTableMap::clearInstancePool(); - DelivzoneTableMap::clearRelatedInstancePool(); + AreaDeliveryModuleTableMap::clearInstancePool(); + AreaDeliveryModuleTableMap::clearRelatedInstancePool(); $con->commit(); } catch (PropelException $e) { @@ -555,9 +648,9 @@ abstract class DelivzoneQuery extends ModelCriteria } /** - * Performs a DELETE on the database, given a ChildDelivzone or Criteria object OR a primary key value. + * Performs a DELETE on the database, given a ChildAreaDeliveryModule or Criteria object OR a primary key value. * - * @param mixed $values Criteria or ChildDelivzone object or primary key or array of primary keys + * @param mixed $values Criteria or ChildAreaDeliveryModule 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 @@ -568,13 +661,13 @@ abstract class DelivzoneQuery extends ModelCriteria public function delete(ConnectionInterface $con = null) { if (null === $con) { - $con = Propel::getServiceContainer()->getWriteConnection(DelivzoneTableMap::DATABASE_NAME); + $con = Propel::getServiceContainer()->getWriteConnection(AreaDeliveryModuleTableMap::DATABASE_NAME); } $criteria = $this; // Set the correct dbName - $criteria->setDbName(DelivzoneTableMap::DATABASE_NAME); + $criteria->setDbName(AreaDeliveryModuleTableMap::DATABASE_NAME); $affectedRows = 0; // initialize var to track total num of affected rows @@ -584,10 +677,10 @@ abstract class DelivzoneQuery extends ModelCriteria $con->beginTransaction(); - DelivzoneTableMap::removeInstanceFromPool($criteria); + AreaDeliveryModuleTableMap::removeInstanceFromPool($criteria); $affectedRows += ModelCriteria::delete($con); - DelivzoneTableMap::clearRelatedInstancePool(); + AreaDeliveryModuleTableMap::clearRelatedInstancePool(); $con->commit(); return $affectedRows; @@ -604,11 +697,11 @@ abstract class DelivzoneQuery extends ModelCriteria * * @param int $nbDays Maximum age of the latest update in days * - * @return ChildDelivzoneQuery The current query, for fluid interface + * @return ChildAreaDeliveryModuleQuery The current query, for fluid interface */ public function recentlyUpdated($nbDays = 7) { - return $this->addUsingAlias(DelivzoneTableMap::UPDATED_AT, time() - $nbDays * 24 * 60 * 60, Criteria::GREATER_EQUAL); + return $this->addUsingAlias(AreaDeliveryModuleTableMap::UPDATED_AT, time() - $nbDays * 24 * 60 * 60, Criteria::GREATER_EQUAL); } /** @@ -616,51 +709,51 @@ abstract class DelivzoneQuery extends ModelCriteria * * @param int $nbDays Maximum age of in days * - * @return ChildDelivzoneQuery The current query, for fluid interface + * @return ChildAreaDeliveryModuleQuery The current query, for fluid interface */ public function recentlyCreated($nbDays = 7) { - return $this->addUsingAlias(DelivzoneTableMap::CREATED_AT, time() - $nbDays * 24 * 60 * 60, Criteria::GREATER_EQUAL); + return $this->addUsingAlias(AreaDeliveryModuleTableMap::CREATED_AT, time() - $nbDays * 24 * 60 * 60, Criteria::GREATER_EQUAL); } /** * Order by update date desc * - * @return ChildDelivzoneQuery The current query, for fluid interface + * @return ChildAreaDeliveryModuleQuery The current query, for fluid interface */ public function lastUpdatedFirst() { - return $this->addDescendingOrderByColumn(DelivzoneTableMap::UPDATED_AT); + return $this->addDescendingOrderByColumn(AreaDeliveryModuleTableMap::UPDATED_AT); } /** * Order by update date asc * - * @return ChildDelivzoneQuery The current query, for fluid interface + * @return ChildAreaDeliveryModuleQuery The current query, for fluid interface */ public function firstUpdatedFirst() { - return $this->addAscendingOrderByColumn(DelivzoneTableMap::UPDATED_AT); + return $this->addAscendingOrderByColumn(AreaDeliveryModuleTableMap::UPDATED_AT); } /** * Order by create date desc * - * @return ChildDelivzoneQuery The current query, for fluid interface + * @return ChildAreaDeliveryModuleQuery The current query, for fluid interface */ public function lastCreatedFirst() { - return $this->addDescendingOrderByColumn(DelivzoneTableMap::CREATED_AT); + return $this->addDescendingOrderByColumn(AreaDeliveryModuleTableMap::CREATED_AT); } /** * Order by create date asc * - * @return ChildDelivzoneQuery The current query, for fluid interface + * @return ChildAreaDeliveryModuleQuery The current query, for fluid interface */ public function firstCreatedFirst() { - return $this->addAscendingOrderByColumn(DelivzoneTableMap::CREATED_AT); + return $this->addAscendingOrderByColumn(AreaDeliveryModuleTableMap::CREATED_AT); } -} // DelivzoneQuery +} // AreaDeliveryModuleQuery diff --git a/core/lib/Thelia/Model/Base/AreaQuery.php b/core/lib/Thelia/Model/Base/AreaQuery.php index f583a30dd..ea4cd8b90 100644 --- a/core/lib/Thelia/Model/Base/AreaQuery.php +++ b/core/lib/Thelia/Model/Base/AreaQuery.php @@ -23,13 +23,13 @@ use Thelia\Model\Map\AreaTableMap; * * @method ChildAreaQuery orderById($order = Criteria::ASC) Order by the id column * @method ChildAreaQuery orderByName($order = Criteria::ASC) Order by the name column - * @method ChildAreaQuery orderByUnit($order = Criteria::ASC) Order by the unit column + * @method ChildAreaQuery orderByPostage($order = Criteria::ASC) Order by the postage column * @method ChildAreaQuery orderByCreatedAt($order = Criteria::ASC) Order by the created_at column * @method ChildAreaQuery orderByUpdatedAt($order = Criteria::ASC) Order by the updated_at column * * @method ChildAreaQuery groupById() Group by the id column * @method ChildAreaQuery groupByName() Group by the name column - * @method ChildAreaQuery groupByUnit() Group by the unit column + * @method ChildAreaQuery groupByPostage() Group by the postage column * @method ChildAreaQuery groupByCreatedAt() Group by the created_at column * @method ChildAreaQuery groupByUpdatedAt() Group by the updated_at column * @@ -41,22 +41,22 @@ use Thelia\Model\Map\AreaTableMap; * @method ChildAreaQuery rightJoinCountry($relationAlias = null) Adds a RIGHT JOIN clause to the query using the Country relation * @method ChildAreaQuery innerJoinCountry($relationAlias = null) Adds a INNER JOIN clause to the query using the Country relation * - * @method ChildAreaQuery leftJoinDelivzone($relationAlias = null) Adds a LEFT JOIN clause to the query using the Delivzone relation - * @method ChildAreaQuery rightJoinDelivzone($relationAlias = null) Adds a RIGHT JOIN clause to the query using the Delivzone relation - * @method ChildAreaQuery innerJoinDelivzone($relationAlias = null) Adds a INNER JOIN clause to the query using the Delivzone relation + * @method ChildAreaQuery leftJoinAreaDeliveryModule($relationAlias = null) Adds a LEFT JOIN clause to the query using the AreaDeliveryModule relation + * @method ChildAreaQuery rightJoinAreaDeliveryModule($relationAlias = null) Adds a RIGHT JOIN clause to the query using the AreaDeliveryModule relation + * @method ChildAreaQuery innerJoinAreaDeliveryModule($relationAlias = null) Adds a INNER JOIN clause to the query using the AreaDeliveryModule relation * * @method ChildArea findOne(ConnectionInterface $con = null) Return the first ChildArea matching the query * @method ChildArea findOneOrCreate(ConnectionInterface $con = null) Return the first ChildArea matching the query, or a new ChildArea object populated from the query conditions when no match is found * * @method ChildArea findOneById(int $id) Return the first ChildArea filtered by the id column * @method ChildArea findOneByName(string $name) Return the first ChildArea filtered by the name column - * @method ChildArea findOneByUnit(double $unit) Return the first ChildArea filtered by the unit column + * @method ChildArea findOneByPostage(double $postage) Return the first ChildArea filtered by the postage column * @method ChildArea findOneByCreatedAt(string $created_at) Return the first ChildArea filtered by the created_at column * @method ChildArea findOneByUpdatedAt(string $updated_at) Return the first ChildArea filtered by the updated_at column * * @method array findById(int $id) Return ChildArea objects filtered by the id column * @method array findByName(string $name) Return ChildArea objects filtered by the name column - * @method array findByUnit(double $unit) Return ChildArea objects filtered by the unit column + * @method array findByPostage(double $postage) Return ChildArea objects filtered by the postage column * @method array findByCreatedAt(string $created_at) Return ChildArea objects filtered by the created_at column * @method array findByUpdatedAt(string $updated_at) Return ChildArea objects filtered by the updated_at column * @@ -147,7 +147,7 @@ abstract class AreaQuery extends ModelCriteria */ protected function findPkSimple($key, $con) { - $sql = 'SELECT ID, NAME, UNIT, CREATED_AT, UPDATED_AT FROM area WHERE ID = :p0'; + $sql = 'SELECT ID, NAME, POSTAGE, CREATED_AT, UPDATED_AT FROM area WHERE ID = :p0'; try { $stmt = $con->prepare($sql); $stmt->bindValue(':p0', $key, PDO::PARAM_INT); @@ -307,16 +307,16 @@ abstract class AreaQuery extends ModelCriteria } /** - * Filter the query on the unit column + * Filter the query on the postage column * * Example usage: * - * $query->filterByUnit(1234); // WHERE unit = 1234 - * $query->filterByUnit(array(12, 34)); // WHERE unit IN (12, 34) - * $query->filterByUnit(array('min' => 12)); // WHERE unit > 12 + * $query->filterByPostage(1234); // WHERE postage = 1234 + * $query->filterByPostage(array(12, 34)); // WHERE postage IN (12, 34) + * $query->filterByPostage(array('min' => 12)); // WHERE postage > 12 * * - * @param mixed $unit The value to use as filter. + * @param mixed $postage 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. @@ -324,16 +324,16 @@ abstract class AreaQuery extends ModelCriteria * * @return ChildAreaQuery The current query, for fluid interface */ - public function filterByUnit($unit = null, $comparison = null) + public function filterByPostage($postage = null, $comparison = null) { - if (is_array($unit)) { + if (is_array($postage)) { $useMinMax = false; - if (isset($unit['min'])) { - $this->addUsingAlias(AreaTableMap::UNIT, $unit['min'], Criteria::GREATER_EQUAL); + if (isset($postage['min'])) { + $this->addUsingAlias(AreaTableMap::POSTAGE, $postage['min'], Criteria::GREATER_EQUAL); $useMinMax = true; } - if (isset($unit['max'])) { - $this->addUsingAlias(AreaTableMap::UNIT, $unit['max'], Criteria::LESS_EQUAL); + if (isset($postage['max'])) { + $this->addUsingAlias(AreaTableMap::POSTAGE, $postage['max'], Criteria::LESS_EQUAL); $useMinMax = true; } if ($useMinMax) { @@ -344,7 +344,7 @@ abstract class AreaQuery extends ModelCriteria } } - return $this->addUsingAlias(AreaTableMap::UNIT, $unit, $comparison); + return $this->addUsingAlias(AreaTableMap::POSTAGE, $postage, $comparison); } /** @@ -507,40 +507,40 @@ abstract class AreaQuery extends ModelCriteria } /** - * Filter the query by a related \Thelia\Model\Delivzone object + * Filter the query by a related \Thelia\Model\AreaDeliveryModule object * - * @param \Thelia\Model\Delivzone|ObjectCollection $delivzone the related object to use as filter + * @param \Thelia\Model\AreaDeliveryModule|ObjectCollection $areaDeliveryModule the related object to use as filter * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildAreaQuery The current query, for fluid interface */ - public function filterByDelivzone($delivzone, $comparison = null) + public function filterByAreaDeliveryModule($areaDeliveryModule, $comparison = null) { - if ($delivzone instanceof \Thelia\Model\Delivzone) { + if ($areaDeliveryModule instanceof \Thelia\Model\AreaDeliveryModule) { return $this - ->addUsingAlias(AreaTableMap::ID, $delivzone->getAreaId(), $comparison); - } elseif ($delivzone instanceof ObjectCollection) { + ->addUsingAlias(AreaTableMap::ID, $areaDeliveryModule->getAreaId(), $comparison); + } elseif ($areaDeliveryModule instanceof ObjectCollection) { return $this - ->useDelivzoneQuery() - ->filterByPrimaryKeys($delivzone->getPrimaryKeys()) + ->useAreaDeliveryModuleQuery() + ->filterByPrimaryKeys($areaDeliveryModule->getPrimaryKeys()) ->endUse(); } else { - throw new PropelException('filterByDelivzone() only accepts arguments of type \Thelia\Model\Delivzone or Collection'); + throw new PropelException('filterByAreaDeliveryModule() only accepts arguments of type \Thelia\Model\AreaDeliveryModule or Collection'); } } /** - * Adds a JOIN clause to the query using the Delivzone relation + * Adds a JOIN clause to the query using the AreaDeliveryModule relation * * @param string $relationAlias optional alias for the relation * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * * @return ChildAreaQuery The current query, for fluid interface */ - public function joinDelivzone($relationAlias = null, $joinType = Criteria::LEFT_JOIN) + public function joinAreaDeliveryModule($relationAlias = null, $joinType = Criteria::INNER_JOIN) { $tableMap = $this->getTableMap(); - $relationMap = $tableMap->getRelation('Delivzone'); + $relationMap = $tableMap->getRelation('AreaDeliveryModule'); // create a ModelJoin object for this join $join = new ModelJoin(); @@ -555,14 +555,14 @@ abstract class AreaQuery extends ModelCriteria $this->addAlias($relationAlias, $relationMap->getRightTable()->getName()); $this->addJoinObject($join, $relationAlias); } else { - $this->addJoinObject($join, 'Delivzone'); + $this->addJoinObject($join, 'AreaDeliveryModule'); } return $this; } /** - * Use the Delivzone relation Delivzone object + * Use the AreaDeliveryModule relation AreaDeliveryModule object * * @see useQuery() * @@ -570,13 +570,13 @@ abstract class AreaQuery extends ModelCriteria * to be used as main alias in the secondary query * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * - * @return \Thelia\Model\DelivzoneQuery A secondary query class using the current class as primary query + * @return \Thelia\Model\AreaDeliveryModuleQuery A secondary query class using the current class as primary query */ - public function useDelivzoneQuery($relationAlias = null, $joinType = Criteria::LEFT_JOIN) + public function useAreaDeliveryModuleQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN) { return $this - ->joinDelivzone($relationAlias, $joinType) - ->useQuery($relationAlias ? $relationAlias : 'Delivzone', '\Thelia\Model\DelivzoneQuery'); + ->joinAreaDeliveryModule($relationAlias, $joinType) + ->useQuery($relationAlias ? $relationAlias : 'AreaDeliveryModule', '\Thelia\Model\AreaDeliveryModuleQuery'); } /** diff --git a/core/lib/Thelia/Model/Base/ContentFolder.php b/core/lib/Thelia/Model/Base/ContentFolder.php index 51d72b974..809825d51 100644 --- a/core/lib/Thelia/Model/Base/ContentFolder.php +++ b/core/lib/Thelia/Model/Base/ContentFolder.php @@ -70,6 +70,12 @@ abstract class ContentFolder implements ActiveRecordInterface */ protected $folder_id; + /** + * The value for the default_folder field. + * @var boolean + */ + protected $default_folder; + /** * The value for the created_at field. * @var string @@ -376,6 +382,17 @@ abstract class ContentFolder implements ActiveRecordInterface return $this->folder_id; } + /** + * Get the [default_folder] column value. + * + * @return boolean + */ + public function getDefaultFolder() + { + + return $this->default_folder; + } + /** * Get the [optionally formatted] temporal [created_at] column value. * @@ -466,6 +483,35 @@ abstract class ContentFolder implements ActiveRecordInterface return $this; } // setFolderId() + /** + * Sets the value of the [default_folder] column. + * Non-boolean arguments are converted using the following rules: + * * 1, '1', 'true', 'on', and 'yes' are converted to boolean true + * * 0, '0', 'false', 'off', and 'no' are converted to boolean false + * Check on string values is case insensitive (so 'FaLsE' is seen as 'false'). + * + * @param boolean|integer|string $v The new value + * @return \Thelia\Model\ContentFolder The current object (for fluent API support) + */ + public function setDefaultFolder($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->default_folder !== $v) { + $this->default_folder = $v; + $this->modifiedColumns[] = ContentFolderTableMap::DEFAULT_FOLDER; + } + + + return $this; + } // setDefaultFolder() + /** * Sets the value of [created_at] column to a normalized version of the date/time value specified. * @@ -551,13 +597,16 @@ abstract class ContentFolder implements ActiveRecordInterface $col = $row[TableMap::TYPE_NUM == $indexType ? 1 + $startcol : ContentFolderTableMap::translateFieldName('FolderId', TableMap::TYPE_PHPNAME, $indexType)]; $this->folder_id = (null !== $col) ? (int) $col : null; - $col = $row[TableMap::TYPE_NUM == $indexType ? 2 + $startcol : ContentFolderTableMap::translateFieldName('CreatedAt', TableMap::TYPE_PHPNAME, $indexType)]; + $col = $row[TableMap::TYPE_NUM == $indexType ? 2 + $startcol : ContentFolderTableMap::translateFieldName('DefaultFolder', TableMap::TYPE_PHPNAME, $indexType)]; + $this->default_folder = (null !== $col) ? (boolean) $col : null; + + $col = $row[TableMap::TYPE_NUM == $indexType ? 3 + $startcol : ContentFolderTableMap::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 : ContentFolderTableMap::translateFieldName('UpdatedAt', TableMap::TYPE_PHPNAME, $indexType)]; + $col = $row[TableMap::TYPE_NUM == $indexType ? 4 + $startcol : ContentFolderTableMap::translateFieldName('UpdatedAt', TableMap::TYPE_PHPNAME, $indexType)]; if ($col === '0000-00-00 00:00:00') { $col = null; } @@ -570,7 +619,7 @@ abstract class ContentFolder implements ActiveRecordInterface $this->ensureConsistency(); } - return $startcol + 4; // 4 = ContentFolderTableMap::NUM_HYDRATE_COLUMNS. + return $startcol + 5; // 5 = ContentFolderTableMap::NUM_HYDRATE_COLUMNS. } catch (Exception $e) { throw new PropelException("Error populating \Thelia\Model\ContentFolder object", 0, $e); @@ -819,6 +868,9 @@ abstract class ContentFolder implements ActiveRecordInterface if ($this->isColumnModified(ContentFolderTableMap::FOLDER_ID)) { $modifiedColumns[':p' . $index++] = 'FOLDER_ID'; } + if ($this->isColumnModified(ContentFolderTableMap::DEFAULT_FOLDER)) { + $modifiedColumns[':p' . $index++] = 'DEFAULT_FOLDER'; + } if ($this->isColumnModified(ContentFolderTableMap::CREATED_AT)) { $modifiedColumns[':p' . $index++] = 'CREATED_AT'; } @@ -842,6 +894,9 @@ abstract class ContentFolder implements ActiveRecordInterface case 'FOLDER_ID': $stmt->bindValue($identifier, $this->folder_id, PDO::PARAM_INT); break; + case 'DEFAULT_FOLDER': + $stmt->bindValue($identifier, (int) $this->default_folder, 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; @@ -910,9 +965,12 @@ abstract class ContentFolder implements ActiveRecordInterface return $this->getFolderId(); break; case 2: - return $this->getCreatedAt(); + return $this->getDefaultFolder(); break; case 3: + return $this->getCreatedAt(); + break; + case 4: return $this->getUpdatedAt(); break; default: @@ -946,8 +1004,9 @@ abstract class ContentFolder implements ActiveRecordInterface $result = array( $keys[0] => $this->getContentId(), $keys[1] => $this->getFolderId(), - $keys[2] => $this->getCreatedAt(), - $keys[3] => $this->getUpdatedAt(), + $keys[2] => $this->getDefaultFolder(), + $keys[3] => $this->getCreatedAt(), + $keys[4] => $this->getUpdatedAt(), ); $virtualColumns = $this->virtualColumns; foreach($virtualColumns as $key => $virtualColumn) @@ -1003,9 +1062,12 @@ abstract class ContentFolder implements ActiveRecordInterface $this->setFolderId($value); break; case 2: - $this->setCreatedAt($value); + $this->setDefaultFolder($value); break; case 3: + $this->setCreatedAt($value); + break; + case 4: $this->setUpdatedAt($value); break; } // switch() @@ -1034,8 +1096,9 @@ abstract class ContentFolder implements ActiveRecordInterface if (array_key_exists($keys[0], $arr)) $this->setContentId($arr[$keys[0]]); if (array_key_exists($keys[1], $arr)) $this->setFolderId($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]]); + if (array_key_exists($keys[2], $arr)) $this->setDefaultFolder($arr[$keys[2]]); + if (array_key_exists($keys[3], $arr)) $this->setCreatedAt($arr[$keys[3]]); + if (array_key_exists($keys[4], $arr)) $this->setUpdatedAt($arr[$keys[4]]); } /** @@ -1049,6 +1112,7 @@ abstract class ContentFolder implements ActiveRecordInterface if ($this->isColumnModified(ContentFolderTableMap::CONTENT_ID)) $criteria->add(ContentFolderTableMap::CONTENT_ID, $this->content_id); if ($this->isColumnModified(ContentFolderTableMap::FOLDER_ID)) $criteria->add(ContentFolderTableMap::FOLDER_ID, $this->folder_id); + if ($this->isColumnModified(ContentFolderTableMap::DEFAULT_FOLDER)) $criteria->add(ContentFolderTableMap::DEFAULT_FOLDER, $this->default_folder); if ($this->isColumnModified(ContentFolderTableMap::CREATED_AT)) $criteria->add(ContentFolderTableMap::CREATED_AT, $this->created_at); if ($this->isColumnModified(ContentFolderTableMap::UPDATED_AT)) $criteria->add(ContentFolderTableMap::UPDATED_AT, $this->updated_at); @@ -1123,6 +1187,7 @@ abstract class ContentFolder implements ActiveRecordInterface { $copyObj->setContentId($this->getContentId()); $copyObj->setFolderId($this->getFolderId()); + $copyObj->setDefaultFolder($this->getDefaultFolder()); $copyObj->setCreatedAt($this->getCreatedAt()); $copyObj->setUpdatedAt($this->getUpdatedAt()); if ($makeNew) { @@ -1261,6 +1326,7 @@ abstract class ContentFolder implements ActiveRecordInterface { $this->content_id = null; $this->folder_id = null; + $this->default_folder = null; $this->created_at = null; $this->updated_at = null; $this->alreadyInSave = false; diff --git a/core/lib/Thelia/Model/Base/ContentFolderQuery.php b/core/lib/Thelia/Model/Base/ContentFolderQuery.php index 208ba80cf..72561ae77 100644 --- a/core/lib/Thelia/Model/Base/ContentFolderQuery.php +++ b/core/lib/Thelia/Model/Base/ContentFolderQuery.php @@ -23,11 +23,13 @@ use Thelia\Model\Map\ContentFolderTableMap; * * @method ChildContentFolderQuery orderByContentId($order = Criteria::ASC) Order by the content_id column * @method ChildContentFolderQuery orderByFolderId($order = Criteria::ASC) Order by the folder_id column + * @method ChildContentFolderQuery orderByDefaultFolder($order = Criteria::ASC) Order by the default_folder column * @method ChildContentFolderQuery orderByCreatedAt($order = Criteria::ASC) Order by the created_at column * @method ChildContentFolderQuery orderByUpdatedAt($order = Criteria::ASC) Order by the updated_at column * * @method ChildContentFolderQuery groupByContentId() Group by the content_id column * @method ChildContentFolderQuery groupByFolderId() Group by the folder_id column + * @method ChildContentFolderQuery groupByDefaultFolder() Group by the default_folder column * @method ChildContentFolderQuery groupByCreatedAt() Group by the created_at column * @method ChildContentFolderQuery groupByUpdatedAt() Group by the updated_at column * @@ -48,11 +50,13 @@ use Thelia\Model\Map\ContentFolderTableMap; * * @method ChildContentFolder findOneByContentId(int $content_id) Return the first ChildContentFolder filtered by the content_id column * @method ChildContentFolder findOneByFolderId(int $folder_id) Return the first ChildContentFolder filtered by the folder_id column + * @method ChildContentFolder findOneByDefaultFolder(boolean $default_folder) Return the first ChildContentFolder filtered by the default_folder column * @method ChildContentFolder findOneByCreatedAt(string $created_at) Return the first ChildContentFolder filtered by the created_at column * @method ChildContentFolder findOneByUpdatedAt(string $updated_at) Return the first ChildContentFolder filtered by the updated_at column * * @method array findByContentId(int $content_id) Return ChildContentFolder objects filtered by the content_id column * @method array findByFolderId(int $folder_id) Return ChildContentFolder objects filtered by the folder_id column + * @method array findByDefaultFolder(boolean $default_folder) Return ChildContentFolder objects filtered by the default_folder column * @method array findByCreatedAt(string $created_at) Return ChildContentFolder objects filtered by the created_at column * @method array findByUpdatedAt(string $updated_at) Return ChildContentFolder objects filtered by the updated_at column * @@ -143,7 +147,7 @@ abstract class ContentFolderQuery extends ModelCriteria */ protected function findPkSimple($key, $con) { - $sql = 'SELECT CONTENT_ID, FOLDER_ID, CREATED_AT, UPDATED_AT FROM content_folder WHERE CONTENT_ID = :p0 AND FOLDER_ID = :p1'; + $sql = 'SELECT CONTENT_ID, FOLDER_ID, DEFAULT_FOLDER, CREATED_AT, UPDATED_AT FROM content_folder WHERE CONTENT_ID = :p0 AND FOLDER_ID = :p1'; try { $stmt = $con->prepare($sql); $stmt->bindValue(':p0', $key[0], PDO::PARAM_INT); @@ -330,6 +334,33 @@ abstract class ContentFolderQuery extends ModelCriteria return $this->addUsingAlias(ContentFolderTableMap::FOLDER_ID, $folderId, $comparison); } + /** + * Filter the query on the default_folder column + * + * Example usage: + * + * $query->filterByDefaultFolder(true); // WHERE default_folder = true + * $query->filterByDefaultFolder('yes'); // WHERE default_folder = true + * + * + * @param boolean|string $defaultFolder 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 ChildContentFolderQuery The current query, for fluid interface + */ + public function filterByDefaultFolder($defaultFolder = null, $comparison = null) + { + if (is_string($defaultFolder)) { + $default_folder = in_array(strtolower($defaultFolder), array('false', 'off', '-', 'no', 'n', '0', '')) ? false : true; + } + + return $this->addUsingAlias(ContentFolderTableMap::DEFAULT_FOLDER, $defaultFolder, $comparison); + } + /** * Filter the query on the created_at column * diff --git a/core/lib/Thelia/Model/Base/Module.php b/core/lib/Thelia/Model/Base/Module.php index a154c382d..7f4df77ce 100644 --- a/core/lib/Thelia/Model/Base/Module.php +++ b/core/lib/Thelia/Model/Base/Module.php @@ -17,6 +17,8 @@ use Propel\Runtime\Exception\PropelException; use Propel\Runtime\Map\TableMap; use Propel\Runtime\Parser\AbstractParser; use Propel\Runtime\Util\PropelDateTime; +use Thelia\Model\AreaDeliveryModule as ChildAreaDeliveryModule; +use Thelia\Model\AreaDeliveryModuleQuery as ChildAreaDeliveryModuleQuery; use Thelia\Model\GroupModule as ChildGroupModule; use Thelia\Model\GroupModuleQuery as ChildGroupModuleQuery; use Thelia\Model\Module as ChildModule; @@ -121,6 +123,12 @@ abstract class Module implements ActiveRecordInterface protected $collOrdersRelatedByDeliveryModuleId; protected $collOrdersRelatedByDeliveryModuleIdPartial; + /** + * @var ObjectCollection|ChildAreaDeliveryModule[] Collection to store aggregation of ChildAreaDeliveryModule objects. + */ + protected $collAreaDeliveryModules; + protected $collAreaDeliveryModulesPartial; + /** * @var ObjectCollection|ChildGroupModule[] Collection to store aggregation of ChildGroupModule objects. */ @@ -167,6 +175,12 @@ abstract class Module implements ActiveRecordInterface */ protected $ordersRelatedByDeliveryModuleIdScheduledForDeletion = null; + /** + * An array of objects scheduled for deletion. + * @var ObjectCollection + */ + protected $areaDeliveryModulesScheduledForDeletion = null; + /** * An array of objects scheduled for deletion. * @var ObjectCollection @@ -846,6 +860,8 @@ abstract class Module implements ActiveRecordInterface $this->collOrdersRelatedByDeliveryModuleId = null; + $this->collAreaDeliveryModules = null; + $this->collGroupModules = null; $this->collModuleI18ns = null; @@ -1017,6 +1033,23 @@ abstract class Module implements ActiveRecordInterface } } + if ($this->areaDeliveryModulesScheduledForDeletion !== null) { + if (!$this->areaDeliveryModulesScheduledForDeletion->isEmpty()) { + \Thelia\Model\AreaDeliveryModuleQuery::create() + ->filterByPrimaryKeys($this->areaDeliveryModulesScheduledForDeletion->getPrimaryKeys(false)) + ->delete($con); + $this->areaDeliveryModulesScheduledForDeletion = null; + } + } + + if ($this->collAreaDeliveryModules !== null) { + foreach ($this->collAreaDeliveryModules as $referrerFK) { + if (!$referrerFK->isDeleted() && ($referrerFK->isNew() || $referrerFK->isModified())) { + $affectedRows += $referrerFK->save($con); + } + } + } + if ($this->groupModulesScheduledForDeletion !== null) { if (!$this->groupModulesScheduledForDeletion->isEmpty()) { \Thelia\Model\GroupModuleQuery::create() @@ -1273,6 +1306,9 @@ abstract class Module implements ActiveRecordInterface if (null !== $this->collOrdersRelatedByDeliveryModuleId) { $result['OrdersRelatedByDeliveryModuleId'] = $this->collOrdersRelatedByDeliveryModuleId->toArray(null, true, $keyType, $includeLazyLoadColumns, $alreadyDumpedObjects); } + if (null !== $this->collAreaDeliveryModules) { + $result['AreaDeliveryModules'] = $this->collAreaDeliveryModules->toArray(null, true, $keyType, $includeLazyLoadColumns, $alreadyDumpedObjects); + } if (null !== $this->collGroupModules) { $result['GroupModules'] = $this->collGroupModules->toArray(null, true, $keyType, $includeLazyLoadColumns, $alreadyDumpedObjects); } @@ -1476,6 +1512,12 @@ abstract class Module implements ActiveRecordInterface } } + foreach ($this->getAreaDeliveryModules() as $relObj) { + if ($relObj !== $this) { // ensure that we don't try to copy a reference to ourselves + $copyObj->addAreaDeliveryModule($relObj->copy($deepCopy)); + } + } + foreach ($this->getGroupModules() as $relObj) { if ($relObj !== $this) { // ensure that we don't try to copy a reference to ourselves $copyObj->addGroupModule($relObj->copy($deepCopy)); @@ -1535,6 +1577,9 @@ abstract class Module implements ActiveRecordInterface if ('OrderRelatedByDeliveryModuleId' == $relationName) { return $this->initOrdersRelatedByDeliveryModuleId(); } + if ('AreaDeliveryModule' == $relationName) { + return $this->initAreaDeliveryModules(); + } if ('GroupModule' == $relationName) { return $this->initGroupModules(); } @@ -2279,6 +2324,249 @@ abstract class Module implements ActiveRecordInterface return $this->getOrdersRelatedByDeliveryModuleId($query, $con); } + /** + * Clears out the collAreaDeliveryModules collection + * + * This does not modify the database; however, it will remove any associated objects, causing + * them to be refetched by subsequent calls to accessor method. + * + * @return void + * @see addAreaDeliveryModules() + */ + public function clearAreaDeliveryModules() + { + $this->collAreaDeliveryModules = null; // important to set this to NULL since that means it is uninitialized + } + + /** + * Reset is the collAreaDeliveryModules collection loaded partially. + */ + public function resetPartialAreaDeliveryModules($v = true) + { + $this->collAreaDeliveryModulesPartial = $v; + } + + /** + * Initializes the collAreaDeliveryModules collection. + * + * By default this just sets the collAreaDeliveryModules collection to an empty array (like clearcollAreaDeliveryModules()); + * however, you may wish to override this method in your stub class to provide setting appropriate + * to your application -- for example, setting the initial array to the values stored in database. + * + * @param boolean $overrideExisting If set to true, the method call initializes + * the collection even if it is not empty + * + * @return void + */ + public function initAreaDeliveryModules($overrideExisting = true) + { + if (null !== $this->collAreaDeliveryModules && !$overrideExisting) { + return; + } + $this->collAreaDeliveryModules = new ObjectCollection(); + $this->collAreaDeliveryModules->setModel('\Thelia\Model\AreaDeliveryModule'); + } + + /** + * Gets an array of ChildAreaDeliveryModule objects which contain a foreign key that references this object. + * + * If the $criteria is not null, it is used to always fetch the results from the database. + * Otherwise the results are fetched from the database the first time, then cached. + * Next time the same method is called without $criteria, the cached collection is returned. + * If this ChildModule is new, it will return + * an empty collection or the current collection; the criteria is ignored on a new object. + * + * @param Criteria $criteria optional Criteria object to narrow the query + * @param ConnectionInterface $con optional connection object + * @return Collection|ChildAreaDeliveryModule[] List of ChildAreaDeliveryModule objects + * @throws PropelException + */ + public function getAreaDeliveryModules($criteria = null, ConnectionInterface $con = null) + { + $partial = $this->collAreaDeliveryModulesPartial && !$this->isNew(); + if (null === $this->collAreaDeliveryModules || null !== $criteria || $partial) { + if ($this->isNew() && null === $this->collAreaDeliveryModules) { + // return empty collection + $this->initAreaDeliveryModules(); + } else { + $collAreaDeliveryModules = ChildAreaDeliveryModuleQuery::create(null, $criteria) + ->filterByModule($this) + ->find($con); + + if (null !== $criteria) { + if (false !== $this->collAreaDeliveryModulesPartial && count($collAreaDeliveryModules)) { + $this->initAreaDeliveryModules(false); + + foreach ($collAreaDeliveryModules as $obj) { + if (false == $this->collAreaDeliveryModules->contains($obj)) { + $this->collAreaDeliveryModules->append($obj); + } + } + + $this->collAreaDeliveryModulesPartial = true; + } + + $collAreaDeliveryModules->getInternalIterator()->rewind(); + + return $collAreaDeliveryModules; + } + + if ($partial && $this->collAreaDeliveryModules) { + foreach ($this->collAreaDeliveryModules as $obj) { + if ($obj->isNew()) { + $collAreaDeliveryModules[] = $obj; + } + } + } + + $this->collAreaDeliveryModules = $collAreaDeliveryModules; + $this->collAreaDeliveryModulesPartial = false; + } + } + + return $this->collAreaDeliveryModules; + } + + /** + * Sets a collection of AreaDeliveryModule objects related by a one-to-many relationship + * to the current object. + * It will also schedule objects for deletion based on a diff between old objects (aka persisted) + * and new objects from the given Propel collection. + * + * @param Collection $areaDeliveryModules A Propel collection. + * @param ConnectionInterface $con Optional connection object + * @return ChildModule The current object (for fluent API support) + */ + public function setAreaDeliveryModules(Collection $areaDeliveryModules, ConnectionInterface $con = null) + { + $areaDeliveryModulesToDelete = $this->getAreaDeliveryModules(new Criteria(), $con)->diff($areaDeliveryModules); + + + $this->areaDeliveryModulesScheduledForDeletion = $areaDeliveryModulesToDelete; + + foreach ($areaDeliveryModulesToDelete as $areaDeliveryModuleRemoved) { + $areaDeliveryModuleRemoved->setModule(null); + } + + $this->collAreaDeliveryModules = null; + foreach ($areaDeliveryModules as $areaDeliveryModule) { + $this->addAreaDeliveryModule($areaDeliveryModule); + } + + $this->collAreaDeliveryModules = $areaDeliveryModules; + $this->collAreaDeliveryModulesPartial = false; + + return $this; + } + + /** + * Returns the number of related AreaDeliveryModule objects. + * + * @param Criteria $criteria + * @param boolean $distinct + * @param ConnectionInterface $con + * @return int Count of related AreaDeliveryModule objects. + * @throws PropelException + */ + public function countAreaDeliveryModules(Criteria $criteria = null, $distinct = false, ConnectionInterface $con = null) + { + $partial = $this->collAreaDeliveryModulesPartial && !$this->isNew(); + if (null === $this->collAreaDeliveryModules || null !== $criteria || $partial) { + if ($this->isNew() && null === $this->collAreaDeliveryModules) { + return 0; + } + + if ($partial && !$criteria) { + return count($this->getAreaDeliveryModules()); + } + + $query = ChildAreaDeliveryModuleQuery::create(null, $criteria); + if ($distinct) { + $query->distinct(); + } + + return $query + ->filterByModule($this) + ->count($con); + } + + return count($this->collAreaDeliveryModules); + } + + /** + * Method called to associate a ChildAreaDeliveryModule object to this object + * through the ChildAreaDeliveryModule foreign key attribute. + * + * @param ChildAreaDeliveryModule $l ChildAreaDeliveryModule + * @return \Thelia\Model\Module The current object (for fluent API support) + */ + public function addAreaDeliveryModule(ChildAreaDeliveryModule $l) + { + if ($this->collAreaDeliveryModules === null) { + $this->initAreaDeliveryModules(); + $this->collAreaDeliveryModulesPartial = true; + } + + if (!in_array($l, $this->collAreaDeliveryModules->getArrayCopy(), true)) { // only add it if the **same** object is not already associated + $this->doAddAreaDeliveryModule($l); + } + + return $this; + } + + /** + * @param AreaDeliveryModule $areaDeliveryModule The areaDeliveryModule object to add. + */ + protected function doAddAreaDeliveryModule($areaDeliveryModule) + { + $this->collAreaDeliveryModules[]= $areaDeliveryModule; + $areaDeliveryModule->setModule($this); + } + + /** + * @param AreaDeliveryModule $areaDeliveryModule The areaDeliveryModule object to remove. + * @return ChildModule The current object (for fluent API support) + */ + public function removeAreaDeliveryModule($areaDeliveryModule) + { + if ($this->getAreaDeliveryModules()->contains($areaDeliveryModule)) { + $this->collAreaDeliveryModules->remove($this->collAreaDeliveryModules->search($areaDeliveryModule)); + if (null === $this->areaDeliveryModulesScheduledForDeletion) { + $this->areaDeliveryModulesScheduledForDeletion = clone $this->collAreaDeliveryModules; + $this->areaDeliveryModulesScheduledForDeletion->clear(); + } + $this->areaDeliveryModulesScheduledForDeletion[]= clone $areaDeliveryModule; + $areaDeliveryModule->setModule(null); + } + + return $this; + } + + + /** + * If this collection has already been initialized with + * an identical criteria, it returns the collection. + * Otherwise if this Module is new, it will return + * an empty collection; or if this Module has previously + * been saved, it will retrieve related AreaDeliveryModules from storage. + * + * This method is protected by default in order to keep the public + * api reasonable. You can provide public methods for those you + * actually need in Module. + * + * @param Criteria $criteria optional Criteria object to narrow the query + * @param ConnectionInterface $con optional connection object + * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) + * @return Collection|ChildAreaDeliveryModule[] List of ChildAreaDeliveryModule objects + */ + public function getAreaDeliveryModulesJoinArea($criteria = null, $con = null, $joinBehavior = Criteria::LEFT_JOIN) + { + $query = ChildAreaDeliveryModuleQuery::create(null, $criteria); + $query->joinWith('Area', $joinBehavior); + + return $this->getAreaDeliveryModules($query, $con); + } + /** * Clears out the collGroupModules collection * @@ -2789,6 +3077,11 @@ abstract class Module implements ActiveRecordInterface $o->clearAllReferences($deep); } } + if ($this->collAreaDeliveryModules) { + foreach ($this->collAreaDeliveryModules as $o) { + $o->clearAllReferences($deep); + } + } if ($this->collGroupModules) { foreach ($this->collGroupModules as $o) { $o->clearAllReferences($deep); @@ -2813,6 +3106,10 @@ abstract class Module implements ActiveRecordInterface $this->collOrdersRelatedByDeliveryModuleId->clearIterator(); } $this->collOrdersRelatedByDeliveryModuleId = null; + if ($this->collAreaDeliveryModules instanceof Collection) { + $this->collAreaDeliveryModules->clearIterator(); + } + $this->collAreaDeliveryModules = null; if ($this->collGroupModules instanceof Collection) { $this->collGroupModules->clearIterator(); } diff --git a/core/lib/Thelia/Model/Base/ModuleQuery.php b/core/lib/Thelia/Model/Base/ModuleQuery.php index 30bdd9178..0ed6c5293 100644 --- a/core/lib/Thelia/Model/Base/ModuleQuery.php +++ b/core/lib/Thelia/Model/Base/ModuleQuery.php @@ -52,6 +52,10 @@ use Thelia\Model\Map\ModuleTableMap; * @method ChildModuleQuery rightJoinOrderRelatedByDeliveryModuleId($relationAlias = null) Adds a RIGHT JOIN clause to the query using the OrderRelatedByDeliveryModuleId relation * @method ChildModuleQuery innerJoinOrderRelatedByDeliveryModuleId($relationAlias = null) Adds a INNER JOIN clause to the query using the OrderRelatedByDeliveryModuleId relation * + * @method ChildModuleQuery leftJoinAreaDeliveryModule($relationAlias = null) Adds a LEFT JOIN clause to the query using the AreaDeliveryModule relation + * @method ChildModuleQuery rightJoinAreaDeliveryModule($relationAlias = null) Adds a RIGHT JOIN clause to the query using the AreaDeliveryModule relation + * @method ChildModuleQuery innerJoinAreaDeliveryModule($relationAlias = null) Adds a INNER JOIN clause to the query using the AreaDeliveryModule relation + * * @method ChildModuleQuery leftJoinGroupModule($relationAlias = null) Adds a LEFT JOIN clause to the query using the GroupModule relation * @method ChildModuleQuery rightJoinGroupModule($relationAlias = null) Adds a RIGHT JOIN clause to the query using the GroupModule relation * @method ChildModuleQuery innerJoinGroupModule($relationAlias = null) Adds a INNER JOIN clause to the query using the GroupModule relation @@ -711,6 +715,79 @@ abstract class ModuleQuery extends ModelCriteria ->useQuery($relationAlias ? $relationAlias : 'OrderRelatedByDeliveryModuleId', '\Thelia\Model\OrderQuery'); } + /** + * Filter the query by a related \Thelia\Model\AreaDeliveryModule object + * + * @param \Thelia\Model\AreaDeliveryModule|ObjectCollection $areaDeliveryModule the related object to use as filter + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * + * @return ChildModuleQuery The current query, for fluid interface + */ + public function filterByAreaDeliveryModule($areaDeliveryModule, $comparison = null) + { + if ($areaDeliveryModule instanceof \Thelia\Model\AreaDeliveryModule) { + return $this + ->addUsingAlias(ModuleTableMap::ID, $areaDeliveryModule->getDeliveryModuleId(), $comparison); + } elseif ($areaDeliveryModule instanceof ObjectCollection) { + return $this + ->useAreaDeliveryModuleQuery() + ->filterByPrimaryKeys($areaDeliveryModule->getPrimaryKeys()) + ->endUse(); + } else { + throw new PropelException('filterByAreaDeliveryModule() only accepts arguments of type \Thelia\Model\AreaDeliveryModule or Collection'); + } + } + + /** + * Adds a JOIN clause to the query using the AreaDeliveryModule relation + * + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * + * @return ChildModuleQuery The current query, for fluid interface + */ + public function joinAreaDeliveryModule($relationAlias = null, $joinType = Criteria::INNER_JOIN) + { + $tableMap = $this->getTableMap(); + $relationMap = $tableMap->getRelation('AreaDeliveryModule'); + + // 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, 'AreaDeliveryModule'); + } + + return $this; + } + + /** + * Use the AreaDeliveryModule relation AreaDeliveryModule 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 \Thelia\Model\AreaDeliveryModuleQuery A secondary query class using the current class as primary query + */ + public function useAreaDeliveryModuleQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN) + { + return $this + ->joinAreaDeliveryModule($relationAlias, $joinType) + ->useQuery($relationAlias ? $relationAlias : 'AreaDeliveryModule', '\Thelia\Model\AreaDeliveryModuleQuery'); + } + /** * Filter the query by a related \Thelia\Model\GroupModule object * diff --git a/core/lib/Thelia/Model/Base/ProductCategory.php b/core/lib/Thelia/Model/Base/ProductCategory.php index 62a6ea425..2c6db3184 100644 --- a/core/lib/Thelia/Model/Base/ProductCategory.php +++ b/core/lib/Thelia/Model/Base/ProductCategory.php @@ -70,6 +70,12 @@ abstract class ProductCategory implements ActiveRecordInterface */ protected $category_id; + /** + * The value for the default_category field. + * @var boolean + */ + protected $default_category; + /** * The value for the created_at field. * @var string @@ -376,6 +382,17 @@ abstract class ProductCategory implements ActiveRecordInterface return $this->category_id; } + /** + * Get the [default_category] column value. + * + * @return boolean + */ + public function getDefaultCategory() + { + + return $this->default_category; + } + /** * Get the [optionally formatted] temporal [created_at] column value. * @@ -466,6 +483,35 @@ abstract class ProductCategory implements ActiveRecordInterface return $this; } // setCategoryId() + /** + * Sets the value of the [default_category] column. + * Non-boolean arguments are converted using the following rules: + * * 1, '1', 'true', 'on', and 'yes' are converted to boolean true + * * 0, '0', 'false', 'off', and 'no' are converted to boolean false + * Check on string values is case insensitive (so 'FaLsE' is seen as 'false'). + * + * @param boolean|integer|string $v The new value + * @return \Thelia\Model\ProductCategory The current object (for fluent API support) + */ + public function setDefaultCategory($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->default_category !== $v) { + $this->default_category = $v; + $this->modifiedColumns[] = ProductCategoryTableMap::DEFAULT_CATEGORY; + } + + + return $this; + } // setDefaultCategory() + /** * Sets the value of [created_at] column to a normalized version of the date/time value specified. * @@ -551,13 +597,16 @@ abstract class ProductCategory implements ActiveRecordInterface $col = $row[TableMap::TYPE_NUM == $indexType ? 1 + $startcol : ProductCategoryTableMap::translateFieldName('CategoryId', TableMap::TYPE_PHPNAME, $indexType)]; $this->category_id = (null !== $col) ? (int) $col : null; - $col = $row[TableMap::TYPE_NUM == $indexType ? 2 + $startcol : ProductCategoryTableMap::translateFieldName('CreatedAt', TableMap::TYPE_PHPNAME, $indexType)]; + $col = $row[TableMap::TYPE_NUM == $indexType ? 2 + $startcol : ProductCategoryTableMap::translateFieldName('DefaultCategory', TableMap::TYPE_PHPNAME, $indexType)]; + $this->default_category = (null !== $col) ? (boolean) $col : null; + + $col = $row[TableMap::TYPE_NUM == $indexType ? 3 + $startcol : ProductCategoryTableMap::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 : ProductCategoryTableMap::translateFieldName('UpdatedAt', TableMap::TYPE_PHPNAME, $indexType)]; + $col = $row[TableMap::TYPE_NUM == $indexType ? 4 + $startcol : ProductCategoryTableMap::translateFieldName('UpdatedAt', TableMap::TYPE_PHPNAME, $indexType)]; if ($col === '0000-00-00 00:00:00') { $col = null; } @@ -570,7 +619,7 @@ abstract class ProductCategory implements ActiveRecordInterface $this->ensureConsistency(); } - return $startcol + 4; // 4 = ProductCategoryTableMap::NUM_HYDRATE_COLUMNS. + return $startcol + 5; // 5 = ProductCategoryTableMap::NUM_HYDRATE_COLUMNS. } catch (Exception $e) { throw new PropelException("Error populating \Thelia\Model\ProductCategory object", 0, $e); @@ -819,6 +868,9 @@ abstract class ProductCategory implements ActiveRecordInterface if ($this->isColumnModified(ProductCategoryTableMap::CATEGORY_ID)) { $modifiedColumns[':p' . $index++] = 'CATEGORY_ID'; } + if ($this->isColumnModified(ProductCategoryTableMap::DEFAULT_CATEGORY)) { + $modifiedColumns[':p' . $index++] = 'DEFAULT_CATEGORY'; + } if ($this->isColumnModified(ProductCategoryTableMap::CREATED_AT)) { $modifiedColumns[':p' . $index++] = 'CREATED_AT'; } @@ -842,6 +894,9 @@ abstract class ProductCategory implements ActiveRecordInterface case 'CATEGORY_ID': $stmt->bindValue($identifier, $this->category_id, PDO::PARAM_INT); break; + case 'DEFAULT_CATEGORY': + $stmt->bindValue($identifier, (int) $this->default_category, 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; @@ -910,9 +965,12 @@ abstract class ProductCategory implements ActiveRecordInterface return $this->getCategoryId(); break; case 2: - return $this->getCreatedAt(); + return $this->getDefaultCategory(); break; case 3: + return $this->getCreatedAt(); + break; + case 4: return $this->getUpdatedAt(); break; default: @@ -946,8 +1004,9 @@ abstract class ProductCategory implements ActiveRecordInterface $result = array( $keys[0] => $this->getProductId(), $keys[1] => $this->getCategoryId(), - $keys[2] => $this->getCreatedAt(), - $keys[3] => $this->getUpdatedAt(), + $keys[2] => $this->getDefaultCategory(), + $keys[3] => $this->getCreatedAt(), + $keys[4] => $this->getUpdatedAt(), ); $virtualColumns = $this->virtualColumns; foreach($virtualColumns as $key => $virtualColumn) @@ -1003,9 +1062,12 @@ abstract class ProductCategory implements ActiveRecordInterface $this->setCategoryId($value); break; case 2: - $this->setCreatedAt($value); + $this->setDefaultCategory($value); break; case 3: + $this->setCreatedAt($value); + break; + case 4: $this->setUpdatedAt($value); break; } // switch() @@ -1034,8 +1096,9 @@ abstract class ProductCategory implements ActiveRecordInterface if (array_key_exists($keys[0], $arr)) $this->setProductId($arr[$keys[0]]); if (array_key_exists($keys[1], $arr)) $this->setCategoryId($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]]); + if (array_key_exists($keys[2], $arr)) $this->setDefaultCategory($arr[$keys[2]]); + if (array_key_exists($keys[3], $arr)) $this->setCreatedAt($arr[$keys[3]]); + if (array_key_exists($keys[4], $arr)) $this->setUpdatedAt($arr[$keys[4]]); } /** @@ -1049,6 +1112,7 @@ abstract class ProductCategory implements ActiveRecordInterface if ($this->isColumnModified(ProductCategoryTableMap::PRODUCT_ID)) $criteria->add(ProductCategoryTableMap::PRODUCT_ID, $this->product_id); if ($this->isColumnModified(ProductCategoryTableMap::CATEGORY_ID)) $criteria->add(ProductCategoryTableMap::CATEGORY_ID, $this->category_id); + if ($this->isColumnModified(ProductCategoryTableMap::DEFAULT_CATEGORY)) $criteria->add(ProductCategoryTableMap::DEFAULT_CATEGORY, $this->default_category); if ($this->isColumnModified(ProductCategoryTableMap::CREATED_AT)) $criteria->add(ProductCategoryTableMap::CREATED_AT, $this->created_at); if ($this->isColumnModified(ProductCategoryTableMap::UPDATED_AT)) $criteria->add(ProductCategoryTableMap::UPDATED_AT, $this->updated_at); @@ -1123,6 +1187,7 @@ abstract class ProductCategory implements ActiveRecordInterface { $copyObj->setProductId($this->getProductId()); $copyObj->setCategoryId($this->getCategoryId()); + $copyObj->setDefaultCategory($this->getDefaultCategory()); $copyObj->setCreatedAt($this->getCreatedAt()); $copyObj->setUpdatedAt($this->getUpdatedAt()); if ($makeNew) { @@ -1261,6 +1326,7 @@ abstract class ProductCategory implements ActiveRecordInterface { $this->product_id = null; $this->category_id = null; + $this->default_category = null; $this->created_at = null; $this->updated_at = null; $this->alreadyInSave = false; diff --git a/core/lib/Thelia/Model/Base/ProductCategoryQuery.php b/core/lib/Thelia/Model/Base/ProductCategoryQuery.php index fd40e93c7..df9fc630b 100644 --- a/core/lib/Thelia/Model/Base/ProductCategoryQuery.php +++ b/core/lib/Thelia/Model/Base/ProductCategoryQuery.php @@ -23,11 +23,13 @@ use Thelia\Model\Map\ProductCategoryTableMap; * * @method ChildProductCategoryQuery orderByProductId($order = Criteria::ASC) Order by the product_id column * @method ChildProductCategoryQuery orderByCategoryId($order = Criteria::ASC) Order by the category_id column + * @method ChildProductCategoryQuery orderByDefaultCategory($order = Criteria::ASC) Order by the default_category column * @method ChildProductCategoryQuery orderByCreatedAt($order = Criteria::ASC) Order by the created_at column * @method ChildProductCategoryQuery orderByUpdatedAt($order = Criteria::ASC) Order by the updated_at column * * @method ChildProductCategoryQuery groupByProductId() Group by the product_id column * @method ChildProductCategoryQuery groupByCategoryId() Group by the category_id column + * @method ChildProductCategoryQuery groupByDefaultCategory() Group by the default_category column * @method ChildProductCategoryQuery groupByCreatedAt() Group by the created_at column * @method ChildProductCategoryQuery groupByUpdatedAt() Group by the updated_at column * @@ -48,11 +50,13 @@ use Thelia\Model\Map\ProductCategoryTableMap; * * @method ChildProductCategory findOneByProductId(int $product_id) Return the first ChildProductCategory filtered by the product_id column * @method ChildProductCategory findOneByCategoryId(int $category_id) Return the first ChildProductCategory filtered by the category_id column + * @method ChildProductCategory findOneByDefaultCategory(boolean $default_category) Return the first ChildProductCategory filtered by the default_category column * @method ChildProductCategory findOneByCreatedAt(string $created_at) Return the first ChildProductCategory filtered by the created_at column * @method ChildProductCategory findOneByUpdatedAt(string $updated_at) Return the first ChildProductCategory filtered by the updated_at column * * @method array findByProductId(int $product_id) Return ChildProductCategory objects filtered by the product_id column * @method array findByCategoryId(int $category_id) Return ChildProductCategory objects filtered by the category_id column + * @method array findByDefaultCategory(boolean $default_category) Return ChildProductCategory objects filtered by the default_category column * @method array findByCreatedAt(string $created_at) Return ChildProductCategory objects filtered by the created_at column * @method array findByUpdatedAt(string $updated_at) Return ChildProductCategory objects filtered by the updated_at column * @@ -143,7 +147,7 @@ abstract class ProductCategoryQuery extends ModelCriteria */ protected function findPkSimple($key, $con) { - $sql = 'SELECT PRODUCT_ID, CATEGORY_ID, CREATED_AT, UPDATED_AT FROM product_category WHERE PRODUCT_ID = :p0 AND CATEGORY_ID = :p1'; + $sql = 'SELECT PRODUCT_ID, CATEGORY_ID, DEFAULT_CATEGORY, CREATED_AT, UPDATED_AT FROM product_category WHERE PRODUCT_ID = :p0 AND CATEGORY_ID = :p1'; try { $stmt = $con->prepare($sql); $stmt->bindValue(':p0', $key[0], PDO::PARAM_INT); @@ -330,6 +334,33 @@ abstract class ProductCategoryQuery extends ModelCriteria return $this->addUsingAlias(ProductCategoryTableMap::CATEGORY_ID, $categoryId, $comparison); } + /** + * Filter the query on the default_category column + * + * Example usage: + * + * $query->filterByDefaultCategory(true); // WHERE default_category = true + * $query->filterByDefaultCategory('yes'); // WHERE default_category = true + * + * + * @param boolean|string $defaultCategory 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 ChildProductCategoryQuery The current query, for fluid interface + */ + public function filterByDefaultCategory($defaultCategory = null, $comparison = null) + { + if (is_string($defaultCategory)) { + $default_category = in_array(strtolower($defaultCategory), array('false', 'off', '-', 'no', 'n', '0', '')) ? false : true; + } + + return $this->addUsingAlias(ProductCategoryTableMap::DEFAULT_CATEGORY, $defaultCategory, $comparison); + } + /** * Filter the query on the created_at column * diff --git a/core/lib/Thelia/Model/Delivzone.php b/core/lib/Thelia/Model/Delivzone.php deleted file mode 100755 index 58d4f0f7b..000000000 --- a/core/lib/Thelia/Model/Delivzone.php +++ /dev/null @@ -1,9 +0,0 @@ - array('Id', 'AreaId', 'Delivery', 'CreatedAt', 'UpdatedAt', ), - self::TYPE_STUDLYPHPNAME => array('id', 'areaId', 'delivery', 'createdAt', 'updatedAt', ), - self::TYPE_COLNAME => array(DelivzoneTableMap::ID, DelivzoneTableMap::AREA_ID, DelivzoneTableMap::DELIVERY, DelivzoneTableMap::CREATED_AT, DelivzoneTableMap::UPDATED_AT, ), - self::TYPE_RAW_COLNAME => array('ID', 'AREA_ID', 'DELIVERY', 'CREATED_AT', 'UPDATED_AT', ), - self::TYPE_FIELDNAME => array('id', 'area_id', 'delivery', 'created_at', 'updated_at', ), + self::TYPE_PHPNAME => array('Id', 'AreaId', 'DeliveryModuleId', 'CreatedAt', 'UpdatedAt', ), + self::TYPE_STUDLYPHPNAME => array('id', 'areaId', 'deliveryModuleId', 'createdAt', 'updatedAt', ), + self::TYPE_COLNAME => array(AreaDeliveryModuleTableMap::ID, AreaDeliveryModuleTableMap::AREA_ID, AreaDeliveryModuleTableMap::DELIVERY_MODULE_ID, AreaDeliveryModuleTableMap::CREATED_AT, AreaDeliveryModuleTableMap::UPDATED_AT, ), + self::TYPE_RAW_COLNAME => array('ID', 'AREA_ID', 'DELIVERY_MODULE_ID', 'CREATED_AT', 'UPDATED_AT', ), + self::TYPE_FIELDNAME => array('id', 'area_id', 'delivery_module_id', 'created_at', 'updated_at', ), self::TYPE_NUM => array(0, 1, 2, 3, 4, ) ); @@ -121,11 +121,11 @@ class DelivzoneTableMap extends TableMap * e.g. self::$fieldKeys[self::TYPE_PHPNAME]['Id'] = 0 */ protected static $fieldKeys = array ( - self::TYPE_PHPNAME => array('Id' => 0, 'AreaId' => 1, 'Delivery' => 2, 'CreatedAt' => 3, 'UpdatedAt' => 4, ), - self::TYPE_STUDLYPHPNAME => array('id' => 0, 'areaId' => 1, 'delivery' => 2, 'createdAt' => 3, 'updatedAt' => 4, ), - self::TYPE_COLNAME => array(DelivzoneTableMap::ID => 0, DelivzoneTableMap::AREA_ID => 1, DelivzoneTableMap::DELIVERY => 2, DelivzoneTableMap::CREATED_AT => 3, DelivzoneTableMap::UPDATED_AT => 4, ), - self::TYPE_RAW_COLNAME => array('ID' => 0, 'AREA_ID' => 1, 'DELIVERY' => 2, 'CREATED_AT' => 3, 'UPDATED_AT' => 4, ), - self::TYPE_FIELDNAME => array('id' => 0, 'area_id' => 1, 'delivery' => 2, 'created_at' => 3, 'updated_at' => 4, ), + self::TYPE_PHPNAME => array('Id' => 0, 'AreaId' => 1, 'DeliveryModuleId' => 2, 'CreatedAt' => 3, 'UpdatedAt' => 4, ), + self::TYPE_STUDLYPHPNAME => array('id' => 0, 'areaId' => 1, 'deliveryModuleId' => 2, 'createdAt' => 3, 'updatedAt' => 4, ), + self::TYPE_COLNAME => array(AreaDeliveryModuleTableMap::ID => 0, AreaDeliveryModuleTableMap::AREA_ID => 1, AreaDeliveryModuleTableMap::DELIVERY_MODULE_ID => 2, AreaDeliveryModuleTableMap::CREATED_AT => 3, AreaDeliveryModuleTableMap::UPDATED_AT => 4, ), + self::TYPE_RAW_COLNAME => array('ID' => 0, 'AREA_ID' => 1, 'DELIVERY_MODULE_ID' => 2, 'CREATED_AT' => 3, 'UPDATED_AT' => 4, ), + self::TYPE_FIELDNAME => array('id' => 0, 'area_id' => 1, 'delivery_module_id' => 2, 'created_at' => 3, 'updated_at' => 4, ), self::TYPE_NUM => array(0, 1, 2, 3, 4, ) ); @@ -139,15 +139,15 @@ class DelivzoneTableMap extends TableMap public function initialize() { // attributes - $this->setName('delivzone'); - $this->setPhpName('Delivzone'); - $this->setClassName('\\Thelia\\Model\\Delivzone'); + $this->setName('area_delivery_module'); + $this->setPhpName('AreaDeliveryModule'); + $this->setClassName('\\Thelia\\Model\\AreaDeliveryModule'); $this->setPackage('Thelia.Model'); $this->setUseIdGenerator(true); // columns $this->addPrimaryKey('ID', 'Id', 'INTEGER', true, null, null); - $this->addForeignKey('AREA_ID', 'AreaId', 'INTEGER', 'area', 'ID', false, null, null); - $this->addColumn('DELIVERY', 'Delivery', 'VARCHAR', true, 45, null); + $this->addForeignKey('AREA_ID', 'AreaId', 'INTEGER', 'area', 'ID', true, null, null); + $this->addForeignKey('DELIVERY_MODULE_ID', 'DeliveryModuleId', 'INTEGER', 'module', 'ID', true, null, null); $this->addColumn('CREATED_AT', 'CreatedAt', 'TIMESTAMP', false, null, null); $this->addColumn('UPDATED_AT', 'UpdatedAt', 'TIMESTAMP', false, null, null); } // initialize() @@ -157,7 +157,8 @@ class DelivzoneTableMap extends TableMap */ public function buildRelations() { - $this->addRelation('Area', '\\Thelia\\Model\\Area', RelationMap::MANY_TO_ONE, array('area_id' => 'id', ), 'SET NULL', 'RESTRICT'); + $this->addRelation('Area', '\\Thelia\\Model\\Area', RelationMap::MANY_TO_ONE, array('area_id' => 'id', ), 'CASCADE', 'RESTRICT'); + $this->addRelation('Module', '\\Thelia\\Model\\Module', RelationMap::MANY_TO_ONE, array('delivery_module_id' => 'id', ), 'CASCADE', 'RESTRICT'); } // buildRelations() /** @@ -229,7 +230,7 @@ class DelivzoneTableMap extends TableMap */ public static function getOMClass($withPrefix = true) { - return $withPrefix ? DelivzoneTableMap::CLASS_DEFAULT : DelivzoneTableMap::OM_CLASS; + return $withPrefix ? AreaDeliveryModuleTableMap::CLASS_DEFAULT : AreaDeliveryModuleTableMap::OM_CLASS; } /** @@ -243,21 +244,21 @@ class DelivzoneTableMap extends TableMap * * @throws PropelException Any exceptions caught during processing will be * rethrown wrapped into a PropelException. - * @return array (Delivzone object, last column rank) + * @return array (AreaDeliveryModule object, last column rank) */ public static function populateObject($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { - $key = DelivzoneTableMap::getPrimaryKeyHashFromRow($row, $offset, $indexType); - if (null !== ($obj = DelivzoneTableMap::getInstanceFromPool($key))) { + $key = AreaDeliveryModuleTableMap::getPrimaryKeyHashFromRow($row, $offset, $indexType); + if (null !== ($obj = AreaDeliveryModuleTableMap::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 + DelivzoneTableMap::NUM_HYDRATE_COLUMNS; + $col = $offset + AreaDeliveryModuleTableMap::NUM_HYDRATE_COLUMNS; } else { - $cls = DelivzoneTableMap::OM_CLASS; + $cls = AreaDeliveryModuleTableMap::OM_CLASS; $obj = new $cls(); $col = $obj->hydrate($row, $offset, false, $indexType); - DelivzoneTableMap::addInstanceToPool($obj, $key); + AreaDeliveryModuleTableMap::addInstanceToPool($obj, $key); } return array($obj, $col); @@ -280,8 +281,8 @@ class DelivzoneTableMap extends TableMap $cls = static::getOMClass(false); // populate the object(s) while ($row = $dataFetcher->fetch()) { - $key = DelivzoneTableMap::getPrimaryKeyHashFromRow($row, 0, $dataFetcher->getIndexType()); - if (null !== ($obj = DelivzoneTableMap::getInstanceFromPool($key))) { + $key = AreaDeliveryModuleTableMap::getPrimaryKeyHashFromRow($row, 0, $dataFetcher->getIndexType()); + if (null !== ($obj = AreaDeliveryModuleTableMap::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 @@ -290,7 +291,7 @@ class DelivzoneTableMap extends TableMap $obj = new $cls(); $obj->hydrate($row); $results[] = $obj; - DelivzoneTableMap::addInstanceToPool($obj, $key); + AreaDeliveryModuleTableMap::addInstanceToPool($obj, $key); } // if key exists } @@ -311,15 +312,15 @@ class DelivzoneTableMap extends TableMap public static function addSelectColumns(Criteria $criteria, $alias = null) { if (null === $alias) { - $criteria->addSelectColumn(DelivzoneTableMap::ID); - $criteria->addSelectColumn(DelivzoneTableMap::AREA_ID); - $criteria->addSelectColumn(DelivzoneTableMap::DELIVERY); - $criteria->addSelectColumn(DelivzoneTableMap::CREATED_AT); - $criteria->addSelectColumn(DelivzoneTableMap::UPDATED_AT); + $criteria->addSelectColumn(AreaDeliveryModuleTableMap::ID); + $criteria->addSelectColumn(AreaDeliveryModuleTableMap::AREA_ID); + $criteria->addSelectColumn(AreaDeliveryModuleTableMap::DELIVERY_MODULE_ID); + $criteria->addSelectColumn(AreaDeliveryModuleTableMap::CREATED_AT); + $criteria->addSelectColumn(AreaDeliveryModuleTableMap::UPDATED_AT); } else { $criteria->addSelectColumn($alias . '.ID'); $criteria->addSelectColumn($alias . '.AREA_ID'); - $criteria->addSelectColumn($alias . '.DELIVERY'); + $criteria->addSelectColumn($alias . '.DELIVERY_MODULE_ID'); $criteria->addSelectColumn($alias . '.CREATED_AT'); $criteria->addSelectColumn($alias . '.UPDATED_AT'); } @@ -334,7 +335,7 @@ class DelivzoneTableMap extends TableMap */ public static function getTableMap() { - return Propel::getServiceContainer()->getDatabaseMap(DelivzoneTableMap::DATABASE_NAME)->getTable(DelivzoneTableMap::TABLE_NAME); + return Propel::getServiceContainer()->getDatabaseMap(AreaDeliveryModuleTableMap::DATABASE_NAME)->getTable(AreaDeliveryModuleTableMap::TABLE_NAME); } /** @@ -342,16 +343,16 @@ class DelivzoneTableMap extends TableMap */ public static function buildTableMap() { - $dbMap = Propel::getServiceContainer()->getDatabaseMap(DelivzoneTableMap::DATABASE_NAME); - if (!$dbMap->hasTable(DelivzoneTableMap::TABLE_NAME)) { - $dbMap->addTableObject(new DelivzoneTableMap()); + $dbMap = Propel::getServiceContainer()->getDatabaseMap(AreaDeliveryModuleTableMap::DATABASE_NAME); + if (!$dbMap->hasTable(AreaDeliveryModuleTableMap::TABLE_NAME)) { + $dbMap->addTableObject(new AreaDeliveryModuleTableMap()); } } /** - * Performs a DELETE on the database, given a Delivzone or Criteria object OR a primary key value. + * Performs a DELETE on the database, given a AreaDeliveryModule or Criteria object OR a primary key value. * - * @param mixed $values Criteria or Delivzone object or primary key or array of primary keys + * @param mixed $values Criteria or AreaDeliveryModule 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 @@ -362,25 +363,25 @@ class DelivzoneTableMap extends TableMap public static function doDelete($values, ConnectionInterface $con = null) { if (null === $con) { - $con = Propel::getServiceContainer()->getWriteConnection(DelivzoneTableMap::DATABASE_NAME); + $con = Propel::getServiceContainer()->getWriteConnection(AreaDeliveryModuleTableMap::DATABASE_NAME); } if ($values instanceof Criteria) { // rename for clarity $criteria = $values; - } elseif ($values instanceof \Thelia\Model\Delivzone) { // it's a model object + } elseif ($values instanceof \Thelia\Model\AreaDeliveryModule) { // 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(DelivzoneTableMap::DATABASE_NAME); - $criteria->add(DelivzoneTableMap::ID, (array) $values, Criteria::IN); + $criteria = new Criteria(AreaDeliveryModuleTableMap::DATABASE_NAME); + $criteria->add(AreaDeliveryModuleTableMap::ID, (array) $values, Criteria::IN); } - $query = DelivzoneQuery::create()->mergeWith($criteria); + $query = AreaDeliveryModuleQuery::create()->mergeWith($criteria); - if ($values instanceof Criteria) { DelivzoneTableMap::clearInstancePool(); + if ($values instanceof Criteria) { AreaDeliveryModuleTableMap::clearInstancePool(); } elseif (!is_object($values)) { // it's a primary key, or an array of pks - foreach ((array) $values as $singleval) { DelivzoneTableMap::removeInstanceFromPool($singleval); + foreach ((array) $values as $singleval) { AreaDeliveryModuleTableMap::removeInstanceFromPool($singleval); } } @@ -388,20 +389,20 @@ class DelivzoneTableMap extends TableMap } /** - * Deletes all rows from the delivzone table. + * Deletes all rows from the area_delivery_module 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 DelivzoneQuery::create()->doDeleteAll($con); + return AreaDeliveryModuleQuery::create()->doDeleteAll($con); } /** - * Performs an INSERT on the database, given a Delivzone or Criteria object. + * Performs an INSERT on the database, given a AreaDeliveryModule or Criteria object. * - * @param mixed $criteria Criteria or Delivzone object containing data that is used to create the INSERT statement. + * @param mixed $criteria Criteria or AreaDeliveryModule 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 @@ -410,22 +411,22 @@ class DelivzoneTableMap extends TableMap public static function doInsert($criteria, ConnectionInterface $con = null) { if (null === $con) { - $con = Propel::getServiceContainer()->getWriteConnection(DelivzoneTableMap::DATABASE_NAME); + $con = Propel::getServiceContainer()->getWriteConnection(AreaDeliveryModuleTableMap::DATABASE_NAME); } if ($criteria instanceof Criteria) { $criteria = clone $criteria; // rename for clarity } else { - $criteria = $criteria->buildCriteria(); // build Criteria from Delivzone object + $criteria = $criteria->buildCriteria(); // build Criteria from AreaDeliveryModule object } - if ($criteria->containsKey(DelivzoneTableMap::ID) && $criteria->keyContainsValue(DelivzoneTableMap::ID) ) { - throw new PropelException('Cannot insert a value for auto-increment primary key ('.DelivzoneTableMap::ID.')'); + if ($criteria->containsKey(AreaDeliveryModuleTableMap::ID) && $criteria->keyContainsValue(AreaDeliveryModuleTableMap::ID) ) { + throw new PropelException('Cannot insert a value for auto-increment primary key ('.AreaDeliveryModuleTableMap::ID.')'); } // Set the correct dbName - $query = DelivzoneQuery::create()->mergeWith($criteria); + $query = AreaDeliveryModuleQuery::create()->mergeWith($criteria); try { // use transaction because $criteria could contain info @@ -441,7 +442,7 @@ class DelivzoneTableMap extends TableMap return $pk; } -} // DelivzoneTableMap +} // AreaDeliveryModuleTableMap // This is the static code needed to register the TableMap for this table with the main Propel class. // -DelivzoneTableMap::buildTableMap(); +AreaDeliveryModuleTableMap::buildTableMap(); diff --git a/core/lib/Thelia/Model/Map/AreaTableMap.php b/core/lib/Thelia/Model/Map/AreaTableMap.php index 9dc308de5..3c1bc5ee4 100644 --- a/core/lib/Thelia/Model/Map/AreaTableMap.php +++ b/core/lib/Thelia/Model/Map/AreaTableMap.php @@ -80,9 +80,9 @@ class AreaTableMap extends TableMap const NAME = 'area.NAME'; /** - * the column name for the UNIT field + * the column name for the POSTAGE field */ - const UNIT = 'area.UNIT'; + const POSTAGE = 'area.POSTAGE'; /** * the column name for the CREATED_AT field @@ -106,11 +106,11 @@ class AreaTableMap extends TableMap * e.g. self::$fieldNames[self::TYPE_PHPNAME][0] = 'Id' */ protected static $fieldNames = array ( - self::TYPE_PHPNAME => array('Id', 'Name', 'Unit', 'CreatedAt', 'UpdatedAt', ), - self::TYPE_STUDLYPHPNAME => array('id', 'name', 'unit', 'createdAt', 'updatedAt', ), - self::TYPE_COLNAME => array(AreaTableMap::ID, AreaTableMap::NAME, AreaTableMap::UNIT, AreaTableMap::CREATED_AT, AreaTableMap::UPDATED_AT, ), - self::TYPE_RAW_COLNAME => array('ID', 'NAME', 'UNIT', 'CREATED_AT', 'UPDATED_AT', ), - self::TYPE_FIELDNAME => array('id', 'name', 'unit', 'created_at', 'updated_at', ), + self::TYPE_PHPNAME => array('Id', 'Name', 'Postage', 'CreatedAt', 'UpdatedAt', ), + self::TYPE_STUDLYPHPNAME => array('id', 'name', 'postage', 'createdAt', 'updatedAt', ), + self::TYPE_COLNAME => array(AreaTableMap::ID, AreaTableMap::NAME, AreaTableMap::POSTAGE, AreaTableMap::CREATED_AT, AreaTableMap::UPDATED_AT, ), + self::TYPE_RAW_COLNAME => array('ID', 'NAME', 'POSTAGE', 'CREATED_AT', 'UPDATED_AT', ), + self::TYPE_FIELDNAME => array('id', 'name', 'postage', 'created_at', 'updated_at', ), self::TYPE_NUM => array(0, 1, 2, 3, 4, ) ); @@ -121,11 +121,11 @@ class AreaTableMap extends TableMap * e.g. self::$fieldKeys[self::TYPE_PHPNAME]['Id'] = 0 */ protected static $fieldKeys = array ( - self::TYPE_PHPNAME => array('Id' => 0, 'Name' => 1, 'Unit' => 2, 'CreatedAt' => 3, 'UpdatedAt' => 4, ), - self::TYPE_STUDLYPHPNAME => array('id' => 0, 'name' => 1, 'unit' => 2, 'createdAt' => 3, 'updatedAt' => 4, ), - self::TYPE_COLNAME => array(AreaTableMap::ID => 0, AreaTableMap::NAME => 1, AreaTableMap::UNIT => 2, AreaTableMap::CREATED_AT => 3, AreaTableMap::UPDATED_AT => 4, ), - self::TYPE_RAW_COLNAME => array('ID' => 0, 'NAME' => 1, 'UNIT' => 2, 'CREATED_AT' => 3, 'UPDATED_AT' => 4, ), - self::TYPE_FIELDNAME => array('id' => 0, 'name' => 1, 'unit' => 2, 'created_at' => 3, 'updated_at' => 4, ), + self::TYPE_PHPNAME => array('Id' => 0, 'Name' => 1, 'Postage' => 2, 'CreatedAt' => 3, 'UpdatedAt' => 4, ), + self::TYPE_STUDLYPHPNAME => array('id' => 0, 'name' => 1, 'postage' => 2, 'createdAt' => 3, 'updatedAt' => 4, ), + self::TYPE_COLNAME => array(AreaTableMap::ID => 0, AreaTableMap::NAME => 1, AreaTableMap::POSTAGE => 2, AreaTableMap::CREATED_AT => 3, AreaTableMap::UPDATED_AT => 4, ), + self::TYPE_RAW_COLNAME => array('ID' => 0, 'NAME' => 1, 'POSTAGE' => 2, 'CREATED_AT' => 3, 'UPDATED_AT' => 4, ), + self::TYPE_FIELDNAME => array('id' => 0, 'name' => 1, 'postage' => 2, 'created_at' => 3, 'updated_at' => 4, ), self::TYPE_NUM => array(0, 1, 2, 3, 4, ) ); @@ -147,7 +147,7 @@ class AreaTableMap extends TableMap // columns $this->addPrimaryKey('ID', 'Id', 'INTEGER', true, null, null); $this->addColumn('NAME', 'Name', 'VARCHAR', true, 100, null); - $this->addColumn('UNIT', 'Unit', 'FLOAT', false, null, null); + $this->addColumn('POSTAGE', 'Postage', 'FLOAT', false, null, null); $this->addColumn('CREATED_AT', 'CreatedAt', 'TIMESTAMP', false, null, null); $this->addColumn('UPDATED_AT', 'UpdatedAt', 'TIMESTAMP', false, null, null); } // initialize() @@ -158,7 +158,7 @@ class AreaTableMap extends TableMap public function buildRelations() { $this->addRelation('Country', '\\Thelia\\Model\\Country', RelationMap::ONE_TO_MANY, array('id' => 'area_id', ), 'SET NULL', 'RESTRICT', 'Countries'); - $this->addRelation('Delivzone', '\\Thelia\\Model\\Delivzone', RelationMap::ONE_TO_MANY, array('id' => 'area_id', ), 'SET NULL', 'RESTRICT', 'Delivzones'); + $this->addRelation('AreaDeliveryModule', '\\Thelia\\Model\\AreaDeliveryModule', RelationMap::ONE_TO_MANY, array('id' => 'area_id', ), 'CASCADE', 'RESTRICT', 'AreaDeliveryModules'); } // buildRelations() /** @@ -181,7 +181,7 @@ class AreaTableMap extends TableMap // Invalidate objects in ".$this->getClassNameFromBuilder($joinedTableTableMapBuilder)." instance pool, // since one or more of them may be deleted by ON DELETE CASCADE/SETNULL rule. CountryTableMap::clearInstancePool(); - DelivzoneTableMap::clearInstancePool(); + AreaDeliveryModuleTableMap::clearInstancePool(); } /** @@ -324,13 +324,13 @@ class AreaTableMap extends TableMap if (null === $alias) { $criteria->addSelectColumn(AreaTableMap::ID); $criteria->addSelectColumn(AreaTableMap::NAME); - $criteria->addSelectColumn(AreaTableMap::UNIT); + $criteria->addSelectColumn(AreaTableMap::POSTAGE); $criteria->addSelectColumn(AreaTableMap::CREATED_AT); $criteria->addSelectColumn(AreaTableMap::UPDATED_AT); } else { $criteria->addSelectColumn($alias . '.ID'); $criteria->addSelectColumn($alias . '.NAME'); - $criteria->addSelectColumn($alias . '.UNIT'); + $criteria->addSelectColumn($alias . '.POSTAGE'); $criteria->addSelectColumn($alias . '.CREATED_AT'); $criteria->addSelectColumn($alias . '.UPDATED_AT'); } diff --git a/core/lib/Thelia/Model/Map/ContentFolderTableMap.php b/core/lib/Thelia/Model/Map/ContentFolderTableMap.php index 4fedae441..9808399ff 100644 --- a/core/lib/Thelia/Model/Map/ContentFolderTableMap.php +++ b/core/lib/Thelia/Model/Map/ContentFolderTableMap.php @@ -57,7 +57,7 @@ class ContentFolderTableMap extends TableMap /** * The total number of columns */ - const NUM_COLUMNS = 4; + const NUM_COLUMNS = 5; /** * The number of lazy-loaded columns @@ -67,7 +67,7 @@ class ContentFolderTableMap extends TableMap /** * The number of columns to hydrate (NUM_COLUMNS - NUM_LAZY_LOAD_COLUMNS) */ - const NUM_HYDRATE_COLUMNS = 4; + const NUM_HYDRATE_COLUMNS = 5; /** * the column name for the CONTENT_ID field @@ -79,6 +79,11 @@ class ContentFolderTableMap extends TableMap */ const FOLDER_ID = 'content_folder.FOLDER_ID'; + /** + * the column name for the DEFAULT_FOLDER field + */ + const DEFAULT_FOLDER = 'content_folder.DEFAULT_FOLDER'; + /** * the column name for the CREATED_AT field */ @@ -101,12 +106,12 @@ class ContentFolderTableMap extends TableMap * e.g. self::$fieldNames[self::TYPE_PHPNAME][0] = 'Id' */ protected static $fieldNames = array ( - self::TYPE_PHPNAME => array('ContentId', 'FolderId', 'CreatedAt', 'UpdatedAt', ), - self::TYPE_STUDLYPHPNAME => array('contentId', 'folderId', 'createdAt', 'updatedAt', ), - self::TYPE_COLNAME => array(ContentFolderTableMap::CONTENT_ID, ContentFolderTableMap::FOLDER_ID, ContentFolderTableMap::CREATED_AT, ContentFolderTableMap::UPDATED_AT, ), - self::TYPE_RAW_COLNAME => array('CONTENT_ID', 'FOLDER_ID', 'CREATED_AT', 'UPDATED_AT', ), - self::TYPE_FIELDNAME => array('content_id', 'folder_id', 'created_at', 'updated_at', ), - self::TYPE_NUM => array(0, 1, 2, 3, ) + self::TYPE_PHPNAME => array('ContentId', 'FolderId', 'DefaultFolder', 'CreatedAt', 'UpdatedAt', ), + self::TYPE_STUDLYPHPNAME => array('contentId', 'folderId', 'defaultFolder', 'createdAt', 'updatedAt', ), + self::TYPE_COLNAME => array(ContentFolderTableMap::CONTENT_ID, ContentFolderTableMap::FOLDER_ID, ContentFolderTableMap::DEFAULT_FOLDER, ContentFolderTableMap::CREATED_AT, ContentFolderTableMap::UPDATED_AT, ), + self::TYPE_RAW_COLNAME => array('CONTENT_ID', 'FOLDER_ID', 'DEFAULT_FOLDER', 'CREATED_AT', 'UPDATED_AT', ), + self::TYPE_FIELDNAME => array('content_id', 'folder_id', 'default_folder', 'created_at', 'updated_at', ), + self::TYPE_NUM => array(0, 1, 2, 3, 4, ) ); /** @@ -116,12 +121,12 @@ class ContentFolderTableMap extends TableMap * e.g. self::$fieldKeys[self::TYPE_PHPNAME]['Id'] = 0 */ protected static $fieldKeys = array ( - self::TYPE_PHPNAME => array('ContentId' => 0, 'FolderId' => 1, 'CreatedAt' => 2, 'UpdatedAt' => 3, ), - self::TYPE_STUDLYPHPNAME => array('contentId' => 0, 'folderId' => 1, 'createdAt' => 2, 'updatedAt' => 3, ), - self::TYPE_COLNAME => array(ContentFolderTableMap::CONTENT_ID => 0, ContentFolderTableMap::FOLDER_ID => 1, ContentFolderTableMap::CREATED_AT => 2, ContentFolderTableMap::UPDATED_AT => 3, ), - self::TYPE_RAW_COLNAME => array('CONTENT_ID' => 0, 'FOLDER_ID' => 1, 'CREATED_AT' => 2, 'UPDATED_AT' => 3, ), - self::TYPE_FIELDNAME => array('content_id' => 0, 'folder_id' => 1, 'created_at' => 2, 'updated_at' => 3, ), - self::TYPE_NUM => array(0, 1, 2, 3, ) + self::TYPE_PHPNAME => array('ContentId' => 0, 'FolderId' => 1, 'DefaultFolder' => 2, 'CreatedAt' => 3, 'UpdatedAt' => 4, ), + self::TYPE_STUDLYPHPNAME => array('contentId' => 0, 'folderId' => 1, 'defaultFolder' => 2, 'createdAt' => 3, 'updatedAt' => 4, ), + self::TYPE_COLNAME => array(ContentFolderTableMap::CONTENT_ID => 0, ContentFolderTableMap::FOLDER_ID => 1, ContentFolderTableMap::DEFAULT_FOLDER => 2, ContentFolderTableMap::CREATED_AT => 3, ContentFolderTableMap::UPDATED_AT => 4, ), + self::TYPE_RAW_COLNAME => array('CONTENT_ID' => 0, 'FOLDER_ID' => 1, 'DEFAULT_FOLDER' => 2, 'CREATED_AT' => 3, 'UPDATED_AT' => 4, ), + self::TYPE_FIELDNAME => array('content_id' => 0, 'folder_id' => 1, 'default_folder' => 2, 'created_at' => 3, 'updated_at' => 4, ), + self::TYPE_NUM => array(0, 1, 2, 3, 4, ) ); /** @@ -143,6 +148,7 @@ class ContentFolderTableMap extends TableMap // columns $this->addForeignPrimaryKey('CONTENT_ID', 'ContentId', 'INTEGER' , 'content', 'ID', true, null, null); $this->addForeignPrimaryKey('FOLDER_ID', 'FolderId', 'INTEGER' , 'folder', 'ID', true, null, null); + $this->addColumn('DEFAULT_FOLDER', 'DefaultFolder', 'BOOLEAN', false, 1, null); $this->addColumn('CREATED_AT', 'CreatedAt', 'TIMESTAMP', false, null, null); $this->addColumn('UPDATED_AT', 'UpdatedAt', 'TIMESTAMP', false, null, null); } // initialize() @@ -358,11 +364,13 @@ class ContentFolderTableMap extends TableMap if (null === $alias) { $criteria->addSelectColumn(ContentFolderTableMap::CONTENT_ID); $criteria->addSelectColumn(ContentFolderTableMap::FOLDER_ID); + $criteria->addSelectColumn(ContentFolderTableMap::DEFAULT_FOLDER); $criteria->addSelectColumn(ContentFolderTableMap::CREATED_AT); $criteria->addSelectColumn(ContentFolderTableMap::UPDATED_AT); } else { $criteria->addSelectColumn($alias . '.CONTENT_ID'); $criteria->addSelectColumn($alias . '.FOLDER_ID'); + $criteria->addSelectColumn($alias . '.DEFAULT_FOLDER'); $criteria->addSelectColumn($alias . '.CREATED_AT'); $criteria->addSelectColumn($alias . '.UPDATED_AT'); } diff --git a/core/lib/Thelia/Model/Map/ModuleTableMap.php b/core/lib/Thelia/Model/Map/ModuleTableMap.php index 252cad5cf..1a2f63692 100644 --- a/core/lib/Thelia/Model/Map/ModuleTableMap.php +++ b/core/lib/Thelia/Model/Map/ModuleTableMap.php @@ -186,6 +186,7 @@ class ModuleTableMap extends TableMap { $this->addRelation('OrderRelatedByPaymentModuleId', '\\Thelia\\Model\\Order', RelationMap::ONE_TO_MANY, array('id' => 'payment_module_id', ), 'RESTRICT', 'RESTRICT', 'OrdersRelatedByPaymentModuleId'); $this->addRelation('OrderRelatedByDeliveryModuleId', '\\Thelia\\Model\\Order', RelationMap::ONE_TO_MANY, array('id' => 'delivery_module_id', ), 'RESTRICT', 'RESTRICT', 'OrdersRelatedByDeliveryModuleId'); + $this->addRelation('AreaDeliveryModule', '\\Thelia\\Model\\AreaDeliveryModule', RelationMap::ONE_TO_MANY, array('id' => 'delivery_module_id', ), 'CASCADE', 'RESTRICT', 'AreaDeliveryModules'); $this->addRelation('GroupModule', '\\Thelia\\Model\\GroupModule', RelationMap::ONE_TO_MANY, array('id' => 'module_id', ), 'CASCADE', 'RESTRICT', 'GroupModules'); $this->addRelation('ModuleI18n', '\\Thelia\\Model\\ModuleI18n', RelationMap::ONE_TO_MANY, array('id' => 'id', ), 'CASCADE', null, 'ModuleI18ns'); } // buildRelations() @@ -210,6 +211,7 @@ class ModuleTableMap extends TableMap { // Invalidate objects in ".$this->getClassNameFromBuilder($joinedTableTableMapBuilder)." instance pool, // since one or more of them may be deleted by ON DELETE CASCADE/SETNULL rule. + AreaDeliveryModuleTableMap::clearInstancePool(); GroupModuleTableMap::clearInstancePool(); ModuleI18nTableMap::clearInstancePool(); } diff --git a/core/lib/Thelia/Model/Map/ProductCategoryTableMap.php b/core/lib/Thelia/Model/Map/ProductCategoryTableMap.php index 6a8361f27..73c87ce9f 100644 --- a/core/lib/Thelia/Model/Map/ProductCategoryTableMap.php +++ b/core/lib/Thelia/Model/Map/ProductCategoryTableMap.php @@ -57,7 +57,7 @@ class ProductCategoryTableMap extends TableMap /** * The total number of columns */ - const NUM_COLUMNS = 4; + const NUM_COLUMNS = 5; /** * The number of lazy-loaded columns @@ -67,7 +67,7 @@ class ProductCategoryTableMap extends TableMap /** * The number of columns to hydrate (NUM_COLUMNS - NUM_LAZY_LOAD_COLUMNS) */ - const NUM_HYDRATE_COLUMNS = 4; + const NUM_HYDRATE_COLUMNS = 5; /** * the column name for the PRODUCT_ID field @@ -79,6 +79,11 @@ class ProductCategoryTableMap extends TableMap */ const CATEGORY_ID = 'product_category.CATEGORY_ID'; + /** + * the column name for the DEFAULT_CATEGORY field + */ + const DEFAULT_CATEGORY = 'product_category.DEFAULT_CATEGORY'; + /** * the column name for the CREATED_AT field */ @@ -101,12 +106,12 @@ class ProductCategoryTableMap extends TableMap * e.g. self::$fieldNames[self::TYPE_PHPNAME][0] = 'Id' */ protected static $fieldNames = array ( - self::TYPE_PHPNAME => array('ProductId', 'CategoryId', 'CreatedAt', 'UpdatedAt', ), - self::TYPE_STUDLYPHPNAME => array('productId', 'categoryId', 'createdAt', 'updatedAt', ), - self::TYPE_COLNAME => array(ProductCategoryTableMap::PRODUCT_ID, ProductCategoryTableMap::CATEGORY_ID, ProductCategoryTableMap::CREATED_AT, ProductCategoryTableMap::UPDATED_AT, ), - self::TYPE_RAW_COLNAME => array('PRODUCT_ID', 'CATEGORY_ID', 'CREATED_AT', 'UPDATED_AT', ), - self::TYPE_FIELDNAME => array('product_id', 'category_id', 'created_at', 'updated_at', ), - self::TYPE_NUM => array(0, 1, 2, 3, ) + self::TYPE_PHPNAME => array('ProductId', 'CategoryId', 'DefaultCategory', 'CreatedAt', 'UpdatedAt', ), + self::TYPE_STUDLYPHPNAME => array('productId', 'categoryId', 'defaultCategory', 'createdAt', 'updatedAt', ), + self::TYPE_COLNAME => array(ProductCategoryTableMap::PRODUCT_ID, ProductCategoryTableMap::CATEGORY_ID, ProductCategoryTableMap::DEFAULT_CATEGORY, ProductCategoryTableMap::CREATED_AT, ProductCategoryTableMap::UPDATED_AT, ), + self::TYPE_RAW_COLNAME => array('PRODUCT_ID', 'CATEGORY_ID', 'DEFAULT_CATEGORY', 'CREATED_AT', 'UPDATED_AT', ), + self::TYPE_FIELDNAME => array('product_id', 'category_id', 'default_category', 'created_at', 'updated_at', ), + self::TYPE_NUM => array(0, 1, 2, 3, 4, ) ); /** @@ -116,12 +121,12 @@ class ProductCategoryTableMap extends TableMap * e.g. self::$fieldKeys[self::TYPE_PHPNAME]['Id'] = 0 */ protected static $fieldKeys = array ( - self::TYPE_PHPNAME => array('ProductId' => 0, 'CategoryId' => 1, 'CreatedAt' => 2, 'UpdatedAt' => 3, ), - self::TYPE_STUDLYPHPNAME => array('productId' => 0, 'categoryId' => 1, 'createdAt' => 2, 'updatedAt' => 3, ), - self::TYPE_COLNAME => array(ProductCategoryTableMap::PRODUCT_ID => 0, ProductCategoryTableMap::CATEGORY_ID => 1, ProductCategoryTableMap::CREATED_AT => 2, ProductCategoryTableMap::UPDATED_AT => 3, ), - self::TYPE_RAW_COLNAME => array('PRODUCT_ID' => 0, 'CATEGORY_ID' => 1, 'CREATED_AT' => 2, 'UPDATED_AT' => 3, ), - self::TYPE_FIELDNAME => array('product_id' => 0, 'category_id' => 1, 'created_at' => 2, 'updated_at' => 3, ), - self::TYPE_NUM => array(0, 1, 2, 3, ) + self::TYPE_PHPNAME => array('ProductId' => 0, 'CategoryId' => 1, 'DefaultCategory' => 2, 'CreatedAt' => 3, 'UpdatedAt' => 4, ), + self::TYPE_STUDLYPHPNAME => array('productId' => 0, 'categoryId' => 1, 'defaultCategory' => 2, 'createdAt' => 3, 'updatedAt' => 4, ), + self::TYPE_COLNAME => array(ProductCategoryTableMap::PRODUCT_ID => 0, ProductCategoryTableMap::CATEGORY_ID => 1, ProductCategoryTableMap::DEFAULT_CATEGORY => 2, ProductCategoryTableMap::CREATED_AT => 3, ProductCategoryTableMap::UPDATED_AT => 4, ), + self::TYPE_RAW_COLNAME => array('PRODUCT_ID' => 0, 'CATEGORY_ID' => 1, 'DEFAULT_CATEGORY' => 2, 'CREATED_AT' => 3, 'UPDATED_AT' => 4, ), + self::TYPE_FIELDNAME => array('product_id' => 0, 'category_id' => 1, 'default_category' => 2, 'created_at' => 3, 'updated_at' => 4, ), + self::TYPE_NUM => array(0, 1, 2, 3, 4, ) ); /** @@ -143,6 +148,7 @@ class ProductCategoryTableMap extends TableMap // columns $this->addForeignPrimaryKey('PRODUCT_ID', 'ProductId', 'INTEGER' , 'product', 'ID', true, null, null); $this->addForeignPrimaryKey('CATEGORY_ID', 'CategoryId', 'INTEGER' , 'category', 'ID', true, null, null); + $this->addColumn('DEFAULT_CATEGORY', 'DefaultCategory', 'BOOLEAN', false, 1, null); $this->addColumn('CREATED_AT', 'CreatedAt', 'TIMESTAMP', false, null, null); $this->addColumn('UPDATED_AT', 'UpdatedAt', 'TIMESTAMP', false, null, null); } // initialize() @@ -358,11 +364,13 @@ class ProductCategoryTableMap extends TableMap if (null === $alias) { $criteria->addSelectColumn(ProductCategoryTableMap::PRODUCT_ID); $criteria->addSelectColumn(ProductCategoryTableMap::CATEGORY_ID); + $criteria->addSelectColumn(ProductCategoryTableMap::DEFAULT_CATEGORY); $criteria->addSelectColumn(ProductCategoryTableMap::CREATED_AT); $criteria->addSelectColumn(ProductCategoryTableMap::UPDATED_AT); } else { $criteria->addSelectColumn($alias . '.PRODUCT_ID'); $criteria->addSelectColumn($alias . '.CATEGORY_ID'); + $criteria->addSelectColumn($alias . '.DEFAULT_CATEGORY'); $criteria->addSelectColumn($alias . '.CREATED_AT'); $criteria->addSelectColumn($alias . '.UPDATED_AT'); } diff --git a/install/thelia.sql b/install/thelia.sql index deb13f9d6..3d003091f 100755 --- a/install/thelia.sql +++ b/install/thelia.sql @@ -66,11 +66,13 @@ CREATE TABLE `product_category` ( `product_id` INTEGER NOT NULL, `category_id` INTEGER NOT NULL, + `default_category` TINYINT(1), `created_at` DATETIME, `updated_at` DATETIME, PRIMARY KEY (`product_id`,`category_id`), INDEX `idx_product_has_category_category1` (`category_id`), INDEX `idx_product_has_category_product1` (`product_id`), + INDEX `idx_product_has_category_default` (`default_category`), CONSTRAINT `fk_product_has_category_product1` FOREIGN KEY (`product_id`) REFERENCES `product` (`id`) @@ -656,9 +658,9 @@ CREATE TABLE `order` INDEX `idx_order_invoice_order_address_id` (`invoice_order_address_id`), INDEX `idx_order_delivery_order_address_id` (`delivery_order_address_id`), INDEX `idx_order_status_id` (`status_id`), - INDEX `fk_order_payment_module_id` (`payment_module_id`), - INDEX `fk_order_delivery_module_id` (`delivery_module_id`), - INDEX `fk_order_lang_id` (`lang_id`), + INDEX `fk_order_payment_module_id_idx` (`payment_module_id`), + INDEX `fk_order_delivery_module_id_idx` (`delivery_module_id`), + INDEX `fk_order_lang_id_idx` (`lang_id`), CONSTRAINT `fk_order_currency_id` FOREIGN KEY (`currency_id`) REFERENCES `currency` (`id`) @@ -871,32 +873,38 @@ CREATE TABLE `area` ( `id` INTEGER NOT NULL AUTO_INCREMENT, `name` VARCHAR(100) NOT NULL, - `unit` FLOAT, + `postage` FLOAT, `created_at` DATETIME, `updated_at` DATETIME, PRIMARY KEY (`id`) ) ENGINE=InnoDB; -- --------------------------------------------------------------------- --- delivzone +-- area_delivery_module -- --------------------------------------------------------------------- -DROP TABLE IF EXISTS `delivzone`; +DROP TABLE IF EXISTS `area_delivery_module`; -CREATE TABLE `delivzone` +CREATE TABLE `area_delivery_module` ( `id` INTEGER NOT NULL AUTO_INCREMENT, - `area_id` INTEGER, - `delivery` VARCHAR(45) NOT NULL, + `area_id` INTEGER NOT NULL, + `delivery_module_id` INTEGER NOT NULL, `created_at` DATETIME, `updated_at` DATETIME, PRIMARY KEY (`id`), - INDEX `idx_delivzone_area_id` (`area_id`), - CONSTRAINT `fk_delivzone_area_id` + INDEX `idx_area_delivery_module_area_id` (`area_id`), + INDEX `idx_area_delivery_module_delivery_module_id` (`delivery_module_id`), + CONSTRAINT `fk_area_delivery_module_area_id` FOREIGN KEY (`area_id`) REFERENCES `area` (`id`) ON UPDATE RESTRICT - ON DELETE SET NULL + ON DELETE CASCADE, + CONSTRAINT `idx_area_delivery_module_delivery_module_id` + FOREIGN KEY (`delivery_module_id`) + REFERENCES `module` (`id`) + ON UPDATE RESTRICT + ON DELETE CASCADE ) ENGINE=InnoDB; -- --------------------------------------------------------------------- @@ -1147,11 +1155,13 @@ CREATE TABLE `content_folder` ( `content_id` INTEGER NOT NULL, `folder_id` INTEGER NOT NULL, + `default_folder` TINYINT(1), `created_at` DATETIME, `updated_at` DATETIME, PRIMARY KEY (`content_id`,`folder_id`), INDEX `idx_content_folder_content_id` (`content_id`), INDEX `idx_content_folder_folder_id` (`folder_id`), + INDEX `idx_content_folder_default` (`default_folder`), CONSTRAINT `fk_content_folder_content_id` FOREIGN KEY (`content_id`) REFERENCES `content` (`id`) diff --git a/local/config/schema.xml b/local/config/schema.xml index 01a1c5350..688fc1fa4 100755 --- a/local/config/schema.xml +++ b/local/config/schema.xml @@ -56,6 +56,7 @@ + @@ -68,6 +69,9 @@ + + +
@@ -548,13 +552,13 @@ - + - + - + @@ -672,19 +676,25 @@
- +
- +
- - - + + + - + + + + + + +
@@ -882,6 +892,7 @@
+ @@ -894,6 +905,9 @@ + + +
diff --git a/templates/default/layout.tpl b/templates/default/layout.tpl index 2674887c4..8150a63a0 100644 --- a/templates/default/layout.tpl +++ b/templates/default/layout.tpl @@ -94,7 +94,7 @@ URL: http://www.thelia.net
    • {/elseloop}
  • - + Cart {cart attr="count_item"}
    • diff --git a/templates/default/cart_delivery.html b/templates/default/order_delivery.html similarity index 99% rename from templates/default/cart_delivery.html rename to templates/default/order_delivery.html index 76e68e03a..b4107fd1c 100644 --- a/templates/default/cart_delivery.html +++ b/templates/default/order_delivery.html @@ -168,7 +168,7 @@ jQuery(function($cart) { $cart(".js-remove-address").click(function(e){ e.preventDefault(); - $cart("#address-delete-link").attr("href", $(this).attr("href")); + $cart("#address-delete-link").attr("href", $cart(this).attr("href")); $cart('#address-delete-modal').modal('show'); }) diff --git a/templates/default/order_invoice.html b/templates/default/order_invoice.html new file mode 100644 index 000000000..f1a6e4205 --- /dev/null +++ b/templates/default/order_invoice.html @@ -0,0 +1,203 @@ +{extends file="layout.tpl"} + +{block name="breadcrumb"} + +{/block} + +{block name="main-content"} +
    +
    + + + + + + + + + + + + + + + + + {loop type="cart" name="cartloop"} + + + + + + + + + {/loop} + + + + + + + + + + + + + + + + + +
      + + Name + + + Price + + + Total +
    + + + {assign "cart_count" $LOOP_COUNT} + {ifloop rel='product-image'} + {loop type="image" name="product-image" product=$PRODUCT_ID limit="1" width="118" height="85" force_return="true"} + Product #{$cart_count} + {/loop} + {/ifloop} + {elseloop rel="product-image"} + {images file='assets/img/product/1/118x85.png'}Product #{$cart_count}{/images} + {/elseloop} + +

    + Product #{$cart_count} +

    +
    +
    +
    Available :
    +
    In Stock
    +
    No.
    +
    {$REF}
    + {*
    Select Size
    +
    Large
    +
    Select Delivery Date
    +
    Jan 2, 2013
    +
    Additional Option
    +
    Option 1
    *} +
    +
    +     		+ {if $IS_PROMO == 1} + {assign "real_price" $PROMO_TAXED_PRICE} +
    {currency attr="symbol"} {$PROMO_TAXED_PRICE}
    + instead of {currency attr="symbol"} {$TAXED_PRICE} + {else} + {assign "real_price" $TAXED_PRICE} +
    {currency attr="symbol"} {$TAXED_PRICE}
    + {/if} +     		+ {currency attr="symbol"} {$real_price * $QUANTITY} +
     Shipping Tax +
    + {order attr="postage"} +
    +
    +
    + + + + +
    +
    Total TTC +
    + $200.00 +
    +
    + +
    +
    +
    Delivery address
    +
    + M. DUPONT Jean + Agency XY +
    + street name of my business
    + 75000 + City, Country +
    +
    +
    +
    +
    Billing address
    +
    + M. DUPONT Jean + Agency XY +
    + street name of my business
    + 75000 + City, Country +
    + Change address +
    +
    +
    + + +
    +
    Choose your payment method
    +
    +
      + $value) { ?> +
    • +
      + +
      +
      • + +
    +
    + + Back + + + + + + + + +
    +{/block} + +{block name="javascript-initialization"} + +{/block} \ No newline at end of file From 3d78af8b974128cd918f8087079ca68f90a701bc Mon Sep 17 00:00:00 2001 From: franck Date: Tue, 17 Sep 2013 13:50:01 +0200 Subject: [PATCH 32/74] Finished category related content management --- core/lib/Thelia/Action/Category.php | 38 +++- .../Thelia/Config/Resources/routing/admin.xml | 15 +- .../Admin/AbstractCrudController.php | 2 +- .../Controller/Admin/CategoryController.php | 110 ++++++++++- core/lib/Thelia/Controller/BaseController.php | 8 + .../Core/Event/CategoryAddContentEvent.php | 48 +++++ .../Core/Event/CategoryDeleteContentEvent.php | 48 +++++ core/lib/Thelia/Core/Event/TheliaEvents.php | 3 + .../Core/Template/Loop/AssociatedContent.php | 30 ++- core/lib/Thelia/Form/CategoryCreationForm.php | 9 +- .../Thelia/Form/CategoryModificationForm.php | 3 +- .../Form/StandardDescriptionFieldsTrait.php | 9 +- core/lib/Thelia/Model/CategoryDocument.php | 2 +- templates/admin/default/category-edit.html | 177 +++++++++++++++++- .../default/includes/inner-form-toolbar.html | 2 + web/index_dev.php | 6 +- 16 files changed, 486 insertions(+), 24 deletions(-) create mode 100644 core/lib/Thelia/Core/Event/CategoryAddContentEvent.php create mode 100644 core/lib/Thelia/Core/Event/CategoryDeleteContentEvent.php diff --git a/core/lib/Thelia/Action/Category.php b/core/lib/Thelia/Action/Category.php index a34f4a85e..64254d734 100755 --- a/core/lib/Thelia/Action/Category.php +++ b/core/lib/Thelia/Action/Category.php @@ -36,6 +36,10 @@ use Thelia\Core\Event\CategoryDeleteEvent; use Thelia\Model\ConfigQuery; use Thelia\Core\Event\UpdatePositionEvent; use Thelia\Core\Event\CategoryToggleVisibilityEvent; +use Thelia\Core\Event\CategoryAddContentEvent; +use Thelia\Core\Event\CategoryDeleteContentEvent; +use Thelia\Model\CategoryAssociatedContent; +use Thelia\Model\CategoryAssociatedContentQuery; class Category extends BaseAction implements EventSubscriberInterface { @@ -147,6 +151,33 @@ class Category extends BaseAction implements EventSubscriberInterface } } + public function addContent(CategoryAddContentEvent $event) { + + if (CategoryAssociatedContentQuery::create() + ->filterByContentId($event->getContentId()) + ->filterByCategory($event->getCategory())->count() <= 0) { + + $content = new CategoryAssociatedContent(); + + $content + ->setCategory($event->getCategory()) + ->setContentId($event->getContentId()) + ->save() + ; + } + } + + public function removeContent(CategoryDeleteContentEvent $event) { + + $content = CategoryAssociatedContentQuery::create() + ->filterByContentId($event->getContentId()) + ->filterByCategory($event->getCategory())->findOne() + ; + + if ($content !== null) $content->delete(); + } + + /** * {@inheritDoc} */ @@ -157,7 +188,12 @@ class Category extends BaseAction implements EventSubscriberInterface TheliaEvents::CATEGORY_UPDATE => array("update", 128), TheliaEvents::CATEGORY_DELETE => array("delete", 128), TheliaEvents::CATEGORY_TOGGLE_VISIBILITY => array("toggleVisibility", 128), - TheliaEvents::CATEGORY_UPDATE_POSITION => array("updatePosition", 128) + + TheliaEvents::CATEGORY_UPDATE_POSITION => array("updatePosition", 128), + + TheliaEvents::CATEGORY_ADD_CONTENT => array("addContent", 128), + TheliaEvents::CATEGORY_REMOVE_CONTENT => array("removeContent", 128), + ); } } diff --git a/core/lib/Thelia/Config/Resources/routing/admin.xml b/core/lib/Thelia/Config/Resources/routing/admin.xml index 53c137988..ca76db188 100755 --- a/core/lib/Thelia/Config/Resources/routing/admin.xml +++ b/core/lib/Thelia/Config/Resources/routing/admin.xml @@ -95,12 +95,25 @@ Thelia\Controller\Admin\CategoryController::updatePositionAction + + + Thelia\Controller\Admin\CategoryController::addRelatedContentAction + + + + Thelia\Controller\Admin\CategoryController::deleteRelatedContentAction + + + + Thelia\Controller\Admin\CategoryController::getAvailableRelatedContentAction + xml|json + + Thelia\Controller\Admin\CategoryController::getByParentIdAction xml|json - diff --git a/core/lib/Thelia/Controller/Admin/AbstractCrudController.php b/core/lib/Thelia/Controller/Admin/AbstractCrudController.php index 5b7f8b60a..7b9550610 100644 --- a/core/lib/Thelia/Controller/Admin/AbstractCrudController.php +++ b/core/lib/Thelia/Controller/Admin/AbstractCrudController.php @@ -224,7 +224,7 @@ abstract class AbstractCrudController extends BaseAdminController * @param unknown $updateEvent the update event * @return Response a response, or null to continue normal processing */ - protected function performAdditionalUpdateAction($updateeEvent) + protected function performAdditionalUpdateAction($updateEvent) { return null; } diff --git a/core/lib/Thelia/Controller/Admin/CategoryController.php b/core/lib/Thelia/Controller/Admin/CategoryController.php index 83d90c86e..a9f5ef4d4 100755 --- a/core/lib/Thelia/Controller/Admin/CategoryController.php +++ b/core/lib/Thelia/Controller/Admin/CategoryController.php @@ -32,6 +32,13 @@ use Thelia\Form\CategoryModificationForm; use Thelia\Form\CategoryCreationForm; use Thelia\Core\Event\UpdatePositionEvent; use Thelia\Core\Event\CategoryToggleVisibilityEvent; +use Thelia\Core\Event\CategoryDeleteContentEvent; +use Thelia\Core\Event\CategoryAddContentEvent; +use Thelia\Model\CategoryAssociatedContent; +use Thelia\Model\FolderQuery; +use Thelia\Model\ContentQuery; +use Propel\Runtime\ActiveQuery\Criteria; +use Thelia\Model\CategoryAssociatedContentQuery; /** * Manages categories @@ -162,14 +169,23 @@ class CategoryController extends AbstractCrudController } protected function renderEditionTemplate() { - return $this->render('category-edit', array('category_id' => $this->getRequest()->get('category_id', 0))); + + return $this->render('category-edit', + array( + 'category_id' => $this->getRequest()->get('category_id', 0), + 'folder_id' => $this->getRequest()->get('folder_id', 0), + 'current_tab' => $this->getRequest()->get('current_tab', 'general') + )); } protected function redirectToEditionTemplate() { $this->redirectToRoute( "admin.categories.update", - array('category_id' => $this->getRequest()->get('category_id', 0)) - ); + array( + 'category_id' => $this->getRequest()->get('category_id', 0), + 'folder_id' => $this->getRequest()->get('folder_id', 0), + 'current_tab' => $this->getRequest()->get('current_tab', 'general') + )); } protected function redirectToListTemplate() { @@ -209,6 +225,18 @@ class CategoryController extends AbstractCrudController ); } + protected function performAdditionalUpdateAction($updateEvent) + { + if ($this->getRequest()->get('save_mode') != 'stay') { + + // Redirect to parent category list + $this->redirectToRoute( + 'admin.categories.default', + array('category_id' => $updateEvent->getCategory()->getParent()) + ); + } + } + protected function performAdditionalUpdatePositionAction($event) { @@ -224,4 +252,80 @@ class CategoryController extends AbstractCrudController return null; } + + public function getAvailableRelatedContentAction($categoryId, $folderId) { + + $result = array(); + + $folders = FolderQuery::create()->filterById($folderId)->find(); + + if ($folders !== null) { + + $list = ContentQuery::create() + ->filterByFolder($folders, Criteria::IN) + ->filterById(CategoryAssociatedContentQuery::create()->select('content_id')->findByCategoryId($categoryId), Criteria::NOT_IN) + ->find(); + ; + + if ($list !== null) { + foreach($list as $item) { + $result[] = array('id' => $item->getId(), 'title' => $item->getTitle()); + } + } + } + + return $this->jsonResponse(json_encode($result)); + } + + public function addRelatedContentAction() { + + // Check current user authorization + if (null !== $response = $this->checkAuth("admin.categories.update")) return $response; + + $content_id = intval($this->getRequest()->get('content_id')); + + if ($content_id > 0) { + + $event = new CategoryAddContentEvent( + $this->getExistingObject(), + $content_id + ); + + try { + $this->dispatch(TheliaEvents::CATEGORY_ADD_CONTENT, $event); + } + catch (\Exception $ex) { + // Any error + return $this->errorPage($ex); + } + } + + $this->redirectToEditionTemplate(); + } + + public function deleteRelatedContentAction() { + + // Check current user authorization + if (null !== $response = $this->checkAuth("admin.categories.update")) return $response; + + $content_id = intval($this->getRequest()->get('content_id')); + + if ($content_id > 0) { + + $event = new CategoryDeleteContentEvent( + $this->getExistingObject(), + $content_id + ); + + try { + $this->dispatch(TheliaEvents::CATEGORY_REMOVE_CONTENT, $event); + } + catch (\Exception $ex) { + // Any error + return $this->errorPage($ex); + } + } + + $this->redirectToEditionTemplate(); + } } diff --git a/core/lib/Thelia/Controller/BaseController.php b/core/lib/Thelia/Controller/BaseController.php index 3c4c0a5bc..1c7140211 100755 --- a/core/lib/Thelia/Controller/BaseController.php +++ b/core/lib/Thelia/Controller/BaseController.php @@ -62,6 +62,14 @@ class BaseController extends ContainerAware return new Response(); } + /** + * Return a JSON response + */ + protected function jsonResponse($json_data) + { + return new Response($json_data, 200, array('content-type' => 'application/json')); + } + /** * Dispatch a Thelia event * diff --git a/core/lib/Thelia/Core/Event/CategoryAddContentEvent.php b/core/lib/Thelia/Core/Event/CategoryAddContentEvent.php new file mode 100644 index 000000000..3ca5b2ae5 --- /dev/null +++ b/core/lib/Thelia/Core/Event/CategoryAddContentEvent.php @@ -0,0 +1,48 @@ +. */ +/* */ +/*************************************************************************************/ + +namespace Thelia\Core\Event; + +use Thelia\Model\Category; + +class CategoryAddContentEvent extends CategoryEvent +{ + protected $content_id; + + public function __construct(Category $category, $content_id) + { + parent::__construct($category); + + $this->content_id = $content_id; + } + + public function getContentId() + { + return $this->content_id; + } + + public function setContentId($content_id) + { + $this->content_id = $content_id; + } +} diff --git a/core/lib/Thelia/Core/Event/CategoryDeleteContentEvent.php b/core/lib/Thelia/Core/Event/CategoryDeleteContentEvent.php new file mode 100644 index 000000000..bb28beb21 --- /dev/null +++ b/core/lib/Thelia/Core/Event/CategoryDeleteContentEvent.php @@ -0,0 +1,48 @@ +. */ +/* */ +/*************************************************************************************/ + +namespace Thelia\Core\Event; + +use Thelia\Model\Category; + +class CategoryDeleteContentEvent extends CategoryEvent +{ + protected $content_id; + + public function __construct(Category $category, $content_id) + { + parent::__construct($category); + + $this->content_id = $content_id; + } + + public function getContentId() + { + return $this->content_id; + } + + public function setContentId($content_id) + { + $this->content_id = $content_id; + } +} diff --git a/core/lib/Thelia/Core/Event/TheliaEvents.php b/core/lib/Thelia/Core/Event/TheliaEvents.php index 1fc91dacb..e7eb41203 100755 --- a/core/lib/Thelia/Core/Event/TheliaEvents.php +++ b/core/lib/Thelia/Core/Event/TheliaEvents.php @@ -153,6 +153,9 @@ final class TheliaEvents const CATEGORY_TOGGLE_VISIBILITY = "action.toggleCategoryVisibility"; const CATEGORY_UPDATE_POSITION = "action.updateCategoryPosition"; + const CATEGORY_ADD_CONTENT = "action.categoryAddContent"; + const CATEGORY_REMOVE_CONTENT = "action.categoryRemoveContent"; + const BEFORE_CREATECATEGORY = "action.before_createcategory"; const AFTER_CREATECATEGORY = "action.after_createcategory"; diff --git a/core/lib/Thelia/Core/Template/Loop/AssociatedContent.php b/core/lib/Thelia/Core/Template/Loop/AssociatedContent.php index 253c48da7..d85f75fa6 100755 --- a/core/lib/Thelia/Core/Template/Loop/AssociatedContent.php +++ b/core/lib/Thelia/Core/Template/Loop/AssociatedContent.php @@ -53,8 +53,12 @@ class AssociatedContent extends Content { $argumentCollection = parent::getArgDefinitions(); - $argumentCollection->addArgument(Argument::createIntTypeArgument('product')) - ->addArgument(Argument::createIntTypeArgument('category')); + $argumentCollection + ->addArgument(Argument::createIntTypeArgument('product')) + ->addArgument(Argument::createIntTypeArgument('category')) + ->addArgument(Argument::createIntTypeArgument('exclude_product')) + ->addArgument(Argument::createIntTypeArgument('exclude_category')) + ; $argumentCollection->get('order')->default = "associated_content"; @@ -91,6 +95,28 @@ class AssociatedContent extends Content $search->filterByCategoryId($category, Criteria::EQUAL); } + $exclude_product = $this->getExcludeProduct(); + + // If we have to filter by template, find all attributes assigned to this template, and filter by found IDs + if (null !== $exclude_product) { + // Exclure tous les attribut qui sont attachés aux templates indiqués + $search->filterById( + ProductAssociatedContentQuery::create()->filterByProductId($exclude_product)->select('product_id')->find(), + Criteria::NOT_IN + ); + } + + $exclude_category = $this->getExcludeCategory(); + + // If we have to filter by template, find all attributes assigned to this template, and filter by found IDs + if (null !== $exclude_category) { + // Exclure tous les attribut qui sont attachés aux templates indiqués + $search->filterById( + CategoryAssociatedContentQuery::create()->filterByProductId($exclude_category)->select('category_id')->find(), + Criteria::NOT_IN + ); + } + $order = $this->getOrder(); $orderByAssociatedContent = array_search('associated_content', $order); $orderByAssociatedContentReverse = array_search('associated_content_reverse', $order); diff --git a/core/lib/Thelia/Form/CategoryCreationForm.php b/core/lib/Thelia/Form/CategoryCreationForm.php index 172b09ee6..5da76c8ba 100755 --- a/core/lib/Thelia/Form/CategoryCreationForm.php +++ b/core/lib/Thelia/Form/CategoryCreationForm.php @@ -43,15 +43,18 @@ class CategoryCreationForm extends BaseForm "label" => Translator::getInstance()->trans("Parent category *"), "constraints" => array( new NotBlank() - ) + ), + "label_attr" => array("for" => "parent_create") )) ->add("locale", "text", array( "constraints" => array( new NotBlank() - ) + ), + "label_attr" => array("for" => "locale_create") )) ->add("visible", "integer", array( - "label" => Translator::getInstance()->trans("This category is online on the front office.") + "label" => Translator::getInstance()->trans("This category is online on the front office."), + "label_attr" => array("for" => "visible_create") )) ; } diff --git a/core/lib/Thelia/Form/CategoryModificationForm.php b/core/lib/Thelia/Form/CategoryModificationForm.php index 42b5893c1..943c0d941 100644 --- a/core/lib/Thelia/Form/CategoryModificationForm.php +++ b/core/lib/Thelia/Form/CategoryModificationForm.php @@ -39,7 +39,8 @@ class CategoryModificationForm extends CategoryCreationForm ->add("url", "text", array( "label" => Translator::getInstance()->trans("Rewriten URL *"), - "constraints" => array(new NotBlank()) + "constraints" => array(new NotBlank()), + "label_attr" => array("for" => "rewriten_url") )) ; diff --git a/core/lib/Thelia/Form/StandardDescriptionFieldsTrait.php b/core/lib/Thelia/Form/StandardDescriptionFieldsTrait.php index 9d1851252..b35aad12f 100644 --- a/core/lib/Thelia/Form/StandardDescriptionFieldsTrait.php +++ b/core/lib/Thelia/Form/StandardDescriptionFieldsTrait.php @@ -58,7 +58,8 @@ trait StandardDescriptionFieldsTrait "label" => Translator::getInstance()->trans("Title"), "label_attr" => array( "for" => "title" - ) + ), + "label_attr" => array("for" => "title_field") ) ); @@ -67,7 +68,7 @@ trait StandardDescriptionFieldsTrait ->add("chapo", "text", array( "label" => Translator::getInstance()->trans("Summary"), "label_attr" => array( - "for" => "summary" + "for" => "summary_field" ) )); @@ -76,7 +77,7 @@ trait StandardDescriptionFieldsTrait ->add("description", "text", array( "label" => Translator::getInstance()->trans("Detailed description"), "label_attr" => array( - "for" => "detailed_description" + "for" => "detailed_description_field" ) )); @@ -85,7 +86,7 @@ trait StandardDescriptionFieldsTrait ->add("postscriptum", "text", array( "label" => Translator::getInstance()->trans("Conclusion"), "label_attr" => array( - "for" => "conclusion" + "for" => "conclusion_field" ) )); } diff --git a/core/lib/Thelia/Model/CategoryDocument.php b/core/lib/Thelia/Model/CategoryDocument.php index 73d99f591..5724e2df1 100755 --- a/core/lib/Thelia/Model/CategoryDocument.php +++ b/core/lib/Thelia/Model/CategoryDocument.php @@ -25,4 +25,4 @@ class CategoryDocument extends BaseCategoryDocument return true; } -} +} \ No newline at end of file diff --git a/templates/admin/default/category-edit.html b/templates/admin/default/category-edit.html index 626114d2a..723cf8242 100755 --- a/templates/admin/default/category-edit.html +++ b/templates/admin/default/category-edit.html @@ -39,8 +39,8 @@
    -
      -
    • {intl l="General description"}
      • +
    -
    +
    From df6b3dbcd5aa170d0c41e3a23c1c8c3b8a95fa8b Mon Sep 17 00:00:00 2001 From: gmorel Date: Tue, 17 Sep 2013 14:42:06 +0200 Subject: [PATCH 36/74] Merge branch 'master' of https://github.com/thelia/thelia # By Etienne Roudeix (10) and franck (2) # Via Etienne Roudeix (3) and franck (2) * 'master' of https://github.com/thelia/thelia: Polished categories related content Finished category related content management delivery process delivery form order delivery form fix fixture dependant unit test delivery process delivery process cart integration cart integration cart page cart template Conflicts: install/faker.php --- install/insert.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/insert.sql b/install/insert.sql index e50c0bd81..c7287089f 100755 --- a/install/insert.sql +++ b/install/insert.sql @@ -34,7 +34,7 @@ INSERT INTO `module` (`id`, `code`, `type`, `activate`, `position`, `full_namesp (1, 'DebugBar', 1, 1, 1, 'DebugBar\\DebugBar', NOW(), NOW()), (2, 'Colissimo', 2, 1, 1, 'Colissimo\\Colissimo', NOW(), NOW()); -INSERT INTO `thelia_2`.`module_i18n` (`id`, `locale`, `title`, `description`, `chapo`, `postscriptum`) VALUES +INSERT INTO `module_i18n` (`id`, `locale`, `title`, `description`, `chapo`, `postscriptum`) VALUES ('2', 'en_US', '72h delivery', NULL, NULL, NULL), ('2', 'fr_FR', 'Livraison par colissimo en 72h', NULL, NULL, NULL); From 63b3e0c3daa3a9abd4a45eaaec6f806d0ac4a2db Mon Sep 17 00:00:00 2001 From: gmorel Date: Tue, 17 Sep 2013 14:46:46 +0200 Subject: [PATCH 37/74] Working : Product : add faker default category --- install/faker.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/faker.php b/install/faker.php index 0303a9a34..45ebb2fc3 100755 --- a/install/faker.php +++ b/install/faker.php @@ -462,7 +462,7 @@ function createProduct($faker, Thelia\Model\Category $category, $position, $temp $productCategories = $product->getProductCategories(); $productCategories[0]->setDefaultCategory(true); $collection = new \Propel\Runtime\Collection\Collection(); - $collection->append($productCategories[0]->setDefaultCategory(true)); + $collection->prepend($productCategories[0]->setDefaultCategory(1)); $product->setProductCategories($collection); $product->setVisible(1); $product->setPosition($position); From fd1aaaef6337c03c3984e7b66a53fd5f5c86f028 Mon Sep 17 00:00:00 2001 From: gmorel Date: Tue, 17 Sep 2013 14:56:17 +0200 Subject: [PATCH 38/74] Working : Content loop : add default content parameter --- core/lib/Thelia/Core/Template/Loop/Content.php | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/core/lib/Thelia/Core/Template/Loop/Content.php b/core/lib/Thelia/Core/Template/Loop/Content.php index 2d849b218..4154b3d7a 100755 --- a/core/lib/Thelia/Core/Template/Loop/Content.php +++ b/core/lib/Thelia/Core/Template/Loop/Content.php @@ -61,6 +61,7 @@ class Content extends BaseI18nLoop return new ArgumentCollection( Argument::createIntListTypeArgument('id'), Argument::createIntListTypeArgument('folder'), + Argument::createIntListTypeArgument('folder_default'), Argument::createBooleanTypeArgument('current'), Argument::createBooleanTypeArgument('current_folder'), Argument::createIntTypeArgument('depth', 1), @@ -97,9 +98,18 @@ class Content extends BaseI18nLoop } $folder = $this->getFolder(); + $folderDefault = $this->getFolderDefault(); + + if (!is_null($folder) || !is_null($folderDefault)) { + + if (!is_null($folder)) { + $folders = FolderQuery::create()->filterById($folder, Criteria::IN)->find(); + } + + if (!is_null($folderDefault)) { + $folders = FolderQuery::create()->filterById($folderDefault, Criteria::IN)->find(); + } - if (!is_null($folder)) { - $folders = FolderQuery::create()->filterById($folder, Criteria::IN)->find(); $depth = $this->getDepth(); From 8d203162179bcd6872588e3b34987e92dad0fe3e Mon Sep 17 00:00:00 2001 From: Etienne Roudeix Date: Tue, 17 Sep 2013 14:59:40 +0200 Subject: [PATCH 39/74] no-return-functions block --- core/lib/Thelia/Config/Resources/config.xml | 1 + .../Controller/Front/BaseFrontController.php | 3 +- .../Controller/Front/OrderController.php | 13 +++-- .../Core/Template/Smarty/Plugins/Security.php | 50 ++++++++++++------- core/lib/Thelia/Exception/OrderException.php | 39 +++++++++++++++ install/insert.sql | 2 +- install/thelia.sql | 1 + local/config/schema.xml | 4 ++ templates/default/account.html | 5 +- templates/default/address-update.html | 6 ++- templates/default/address.html | 5 +- templates/default/layout.tpl | 1 + templates/default/order_delivery.html | 5 ++ 13 files changed, 108 insertions(+), 27 deletions(-) create mode 100755 core/lib/Thelia/Exception/OrderException.php diff --git a/core/lib/Thelia/Config/Resources/config.xml b/core/lib/Thelia/Config/Resources/config.xml index e8ea3a9d5..1014d7cad 100755 --- a/core/lib/Thelia/Config/Resources/config.xml +++ b/core/lib/Thelia/Config/Resources/config.xml @@ -203,6 +203,7 @@ + diff --git a/core/lib/Thelia/Controller/Front/BaseFrontController.php b/core/lib/Thelia/Controller/Front/BaseFrontController.php index 6540f28a4..69ea8553d 100755 --- a/core/lib/Thelia/Controller/Front/BaseFrontController.php +++ b/core/lib/Thelia/Controller/Front/BaseFrontController.php @@ -60,7 +60,8 @@ class BaseFrontController extends BaseController protected function checkCartNotEmpty() { - if($this->getSession()->getCart()->countCartItems() == 0) { + $cart = $this->getSession()->getCart(); + if($cart===null || $cart->countCartItems() == 0) { $this->redirectToRoute("cart.view"); } } diff --git a/core/lib/Thelia/Controller/Front/OrderController.php b/core/lib/Thelia/Controller/Front/OrderController.php index 1bac39b14..f34715894 100755 --- a/core/lib/Thelia/Controller/Front/OrderController.php +++ b/core/lib/Thelia/Controller/Front/OrderController.php @@ -29,7 +29,8 @@ use Thelia\Core\Event\TheliaEvents; use Symfony\Component\HttpFoundation\Request; use Thelia\Form\OrderDelivery; use Thelia\Log\Tlog; -use Thelia\Model\Base\AddressQuery; +use Thelia\Model\AddressQuery; +use Thelia\Model\AreaDeliveryModuleQuery; use Thelia\Model\Order; /** @@ -53,9 +54,6 @@ class OrderController extends BaseFrontController $orderDelivery = new OrderDelivery($this->getRequest()); - $x = $this->getRequest(); - $y = $_POST; - try { $form = $this->validateForm($orderDelivery, "post"); @@ -69,7 +67,12 @@ class OrderController extends BaseFrontController } /* check that the delivery module fetch the delivery address area */ - + if(AreaDeliveryModuleQuery::create() + ->filterByAreaId($deliveryAddress->getCountry()->getAreaId()) + ->filterByDeliveryModuleId() + ->count() == 0) { + throw new \Exception("PUKE"); + } $orderEvent = $this->getOrderEvent(); diff --git a/core/lib/Thelia/Core/Template/Smarty/Plugins/Security.php b/core/lib/Thelia/Core/Template/Smarty/Plugins/Security.php index 24d2c29ee..71b9c3f81 100755 --- a/core/lib/Thelia/Core/Template/Smarty/Plugins/Security.php +++ b/core/lib/Thelia/Core/Template/Smarty/Plugins/Security.php @@ -23,18 +23,22 @@ namespace Thelia\Core\Template\Smarty\Plugins; +use Thelia\Core\HttpFoundation\Request; use Thelia\Core\Template\Smarty\SmartyPluginDescriptor; use Thelia\Core\Template\Smarty\AbstractSmartyPlugin; use Thelia\Core\Security\SecurityContext; use Thelia\Core\Security\Exception\AuthenticationException; +use Thelia\Exception\OrderException; class Security extends AbstractSmartyPlugin { + protected $request; private $securityContext; - public function __construct(SecurityContext $securityContext) + public function __construct(Request $request, SecurityContext $securityContext) { $this->securityContext = $securityContext; + $this->request = $request; } /** @@ -43,32 +47,43 @@ class Security extends AbstractSmartyPlugin * @param array $params * @param unknown $smarty * @return string no text is returned. + * @throws \Thelia\Core\Security\Exception\AuthenticationException */ public function checkAuthFunction($params, &$smarty) { - $roles = $this->_explode($this->getParam($params, 'roles')); - $permissions = $this->_explode($this->getParam($params, 'permissions')); + $roles = $this->_explode($this->getParam($params, 'roles')); + $permissions = $this->_explode($this->getParam($params, 'permissions')); - if (! $this->securityContext->isGranted($roles, $permissions)) { + if (! $this->securityContext->isGranted($roles, $permissions)) { - $ex = new AuthenticationException( - sprintf("User not granted for roles '%s', permissions '%s' in context '%s'.", - implode(',', $roles), implode(',', $permissions), $context - ) - ); + $ex = new AuthenticationException( + sprintf("User not granted for roles '%s', permissions '%s' in context '%s'.", + implode(',', $roles), implode(',', $permissions), $context + ) + ); - $loginTpl = $this->getParam($params, 'login_tpl'); + $loginTpl = $this->getParam($params, 'login_tpl'); - if (null != $loginTpl) { - $ex->setLoginTemplate($loginTpl); - } + if (null != $loginTpl) { + $ex->setLoginTemplate($loginTpl); + } - throw $ex; - } + throw $ex; + } - return ''; + return ''; } + public function checkCartNotEmptyFunction($params, &$smarty) + { + $cart = $this->request->getSession()->getCart(); + if($cart===null || $cart->countCartItems() == 0) { + throw new OrderException('Cart must not be empty', OrderException::CART_EMPTY); + } + + return ""; + } + /** * Define the various smarty plugins handled by this class * @@ -77,7 +92,8 @@ class Security extends AbstractSmartyPlugin public function getPluginDescriptors() { return array( - new SmartyPluginDescriptor('function', 'check_auth', $this, 'checkAuthFunction') + new SmartyPluginDescriptor('function', 'check_auth', $this, 'checkAuthFunction'), + new SmartyPluginDescriptor('function', 'check_cart_not_empty', $this, 'checkCartNotEmptyFunction'), ); } } diff --git a/core/lib/Thelia/Exception/OrderException.php b/core/lib/Thelia/Exception/OrderException.php new file mode 100755 index 000000000..d276f8b59 --- /dev/null +++ b/core/lib/Thelia/Exception/OrderException.php @@ -0,0 +1,39 @@ +. */ +/* */ +/*************************************************************************************/ + +namespace Thelia\Exception; + +class OrderException extends \RuntimeException +{ + const UNKNOWN_EXCEPTION = 0; + + const CART_EMPTY = 100; + + public function __construct($message, $code = null, $previous = null) + { + if ($code === null) { + $code = self::UNKNOWN_EXCEPTION; + } + parent::__construct($message, $code, $previous); + } +} diff --git a/install/insert.sql b/install/insert.sql index e50c0bd81..c7287089f 100755 --- a/install/insert.sql +++ b/install/insert.sql @@ -34,7 +34,7 @@ INSERT INTO `module` (`id`, `code`, `type`, `activate`, `position`, `full_namesp (1, 'DebugBar', 1, 1, 1, 'DebugBar\\DebugBar', NOW(), NOW()), (2, 'Colissimo', 2, 1, 1, 'Colissimo\\Colissimo', NOW(), NOW()); -INSERT INTO `thelia_2`.`module_i18n` (`id`, `locale`, `title`, `description`, `chapo`, `postscriptum`) VALUES +INSERT INTO `module_i18n` (`id`, `locale`, `title`, `description`, `chapo`, `postscriptum`) VALUES ('2', 'en_US', '72h delivery', NULL, NULL, NULL), ('2', 'fr_FR', 'Livraison par colissimo en 72h', NULL, NULL, NULL); diff --git a/install/thelia.sql b/install/thelia.sql index 3d003091f..dd3247d57 100755 --- a/install/thelia.sql +++ b/install/thelia.sql @@ -893,6 +893,7 @@ CREATE TABLE `area_delivery_module` `created_at` DATETIME, `updated_at` DATETIME, PRIMARY KEY (`id`), + UNIQUE INDEX `delivery_module_id_area_id_UNIQUE` (`area_id`, `delivery_module_id`), INDEX `idx_area_delivery_module_area_id` (`area_id`), INDEX `idx_area_delivery_module_delivery_module_id` (`delivery_module_id`), CONSTRAINT `fk_area_delivery_module_area_id` diff --git a/local/config/schema.xml b/local/config/schema.xml index 688fc1fa4..9b52fff61 100755 --- a/local/config/schema.xml +++ b/local/config/schema.xml @@ -695,6 +695,10 @@ + + + + diff --git a/templates/default/account.html b/templates/default/account.html index 94bd58501..cffd5d754 100644 --- a/templates/default/account.html +++ b/templates/default/account.html @@ -1,6 +1,9 @@ -{check_auth context="front" roles="CUSTOMER" login_tpl="login"} {extends file="layout.tpl"} +{block name="no-return-functions"} + {check_auth context="front" roles="CUSTOMER" login_tpl="login"} +{/block} + {block name="breadcrumb"}
    - - - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - - - - - - - - - -
    - - - - - - - - - - -
    - - - - - - - - -
    - - - - - - - - - - - - - - - - - - - - - - - - -
    - - - - - - - - - - - - -
    - - - - - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - - - - - -
    - - - - - - - - - - - -
    - - - - - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    - - - - - - - - - - -
    - - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    - - - - - - - - - - - - -
    - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - - - - - - -
    - - - - - - - - - - - -
    - - - - - - - - - - - - -
    - - - - - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - - - - - - -
    - - - - - -
    - - - - - - - - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - - -
    - - - - - - - - - - - -
    - - - - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    - - - - - - - - - - - -
    - - - - - - - - -
    - - - - - - - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - - - - - - - - -
    - - - - - - - - - - - -
    - - - - - - - -
    - + + + + + + + + + + + + + + + + + + + +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    + + + + + + + + + + + + + + + + + + + + +
    + + + + + + + + + + + + + + + + + + + + + +
    + + + + + + + + + + +
    + + + + + + + + +
    + + + + + + + + + + + + + + + + + + + + + + + + +
    + + + + + + + + + + + + +
    + + + + + + + + + + + + + + + + + + +
    + + + + + + + + + + + + + + + + + + + + + + + + + + +
    + + + + + + + + + + + + + + + + + +
    + + + + + + + + + + + +
    + + + + + + + + + + + + + + + + + + +
    + + + + + + + + + + + + + + + + + + + + + + + +
    + + + + + + + + + + + + + + + + + + +
    + + + + + + + + + + + + + + + + + +
    + + + + + + + + + + + + + + + + + +
    + + + + + + + + + + + + + + + + + + + + + + + + + +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    + + + + + + + + + + +
    + + + + + + + + + + + + + + + +
    + + + + + + + + + + + + + + + + + +
    + + + + + + + + + + + + + + + + +
    + + + + + + + + + + + + + + + + + + + +
    + + + + + + + + + + + + + + + + + + + +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    + + + + + + + + + + + + +
    + + + + + + + + + + + + + + +
    + + + + + + + + + + + + + + + + + + +
    + + + + + + + + + + + +
    + + + + + + + + + + + + +
    + + + + + + + + + + + + + + + + + + +
    + + + + + + + + + + + + + + + + + + +
    + + + + + +
    + + + + + + + + + + + + + + + + + +
    + + + + + + + + + + + + + + +
    + + + + + + + + + + + + + + +
    + + + + + + + + + + + +
    + + + + + + + + + + + + + + + + + +
    + + + + + + + + + + + + + + + + + + + +
    + + + + + + + + + + + + + + + + + + +
    + + + + + + + + + + + + + + + + + + + +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    + + + + + + + + + + + +
    + + + + + + + + +
    + + + + + + + + + + + + + + + + + + + + +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    + + + + + + + + + + + + + + + + + + +
    + + + + + + + + + + + + + + + + + + + +
    + + + + + + + + + + + + + + + + + + + +
    + + + + + + + + + + + + + + + + + + + +
    + + + + + + + + + + + + + + + + + + + +
    + + + + + + + + + + + + + + + + + + + +
    + + + + + + + + + + + + + + + + + + + +
    + + + + + + + + + + + + + + + + + + +
    + + + + + + + + + + + + + + + + + + +
    + + + + + + + + + + + + + + + + + + + + +
    + + + + + + + + + + + +
    + + + + + + + +
    +     diff --git a/templates/admin/default/categories.html b/templates/admin/default/categories.html index 32b9e6cba..b2ca8440e 100755 --- a/templates/admin/default/categories.html +++ b/templates/admin/default/categories.html @@ -16,6 +16,7 @@
    +
    {* display parent category name, and get current cat ID *} @@ -171,6 +172,162 @@ {/elseloop}
    +
    +
    +
    + +{* -- PRODUCT MANAGEMENT ---------------------------------------------------- *} + +
    +
    +
    + + + + + {ifloop rel="product_list"} + + + + + + + + + + + + + + + + {loop name="product_list" type="product" visible="*" category_default=$category_id order=$product_order} + + + + + + + + {module_include location='product_list_row'} + + + + + + + + {/loop} + + {/ifloop} + + {elseloop rel="product_list"} + + + + + + {/elseloop} +
    + {* display parent category name *} + {loop name="category_title" type="category" visible="*" id=$category_id} + {intl l="Products in %cat" cat=$TITLE} + {/loop} + + {elseloop rel="category_title"} + {intl l="Top level Products"} + {/elseloop} + + {module_include location='product_list_caption'} + + + + +
    + {admin_sortable_header + current_order=$product_order + order='id' + reverse_order='id_reverse' + path={url path='/admin/categories' id_category=$category_id target='products'} + label="{intl l='ID'}" + } + +   + {admin_sortable_header + current_order=$product_order + order='ref' + reverse_order='ref_reverse' + path={url path='/admin/categories' id_category=$category_id target='products'} + label="{intl l='Reference'}" + } + + {admin_sortable_header + current_order=$product_order + order='alpha' + reverse_order='alpha_reverse' + path={url path='/admin/categories' id_category=$category_id target='products'} + label="{intl l='Product title'}" + } + + {module_include location='product_list_header'} + + + {admin_sortable_header + current_order=$product_order + order='visible' + reverse_order='visible_reverse' + path={url path='/admin/categories' id_category=$category_id target='products'} + label="{intl l='Online'}" + } + + {admin_sortable_header + current_order=$product_order + order='manual' + reverse_order='manual_reverse' + path={url path='/admin/categories' id_category=$category_id target='products'} + label="{intl l='Position'}" + } +  
    {$ID} + {loop type="image" name="cat_image" source="product" source_id="$ID" limit="1" width="50" height="50" resize_mode="crop" backend_context="1"} + + {$TITLE} + + {/loop} + + {$REF}{$TITLE} + {loop type="auth" name="can_change" roles="ADMIN" permissions="admin.products.edit"} +
    + +
    + {/loop} + + {elseloop rel="can_delete"} +
    + +
    + {/elseloop} +     		+ {admin_position_block + permission="admin.product.edit" + path={url path='admin/product' category_id=$ID} + url_parameter="product_id" + in_place_edit_class="productPositionChange" + position=$POSITION + id=$ID + } + +
    + {loop type="auth" name="can_change" roles="ADMIN" permissions="admin.product.edit"} + + {/loop} + + {loop type="auth" name="can_delete" roles="ADMIN" permissions="admin.product.delete"} + + {/loop} +
    +
    {intl l="This category doesn't contains any products. To add a new product, click the + button above."}
    + +
    @@ -178,6 +335,10 @@ {module_include location='categories_bottom'}
    + + {module_include location='catalog_bottom'} +
    +
    @@ -251,7 +412,7 @@ {/form} - {* Delete confirmation dialog *} + {* Delete category confirmation dialog *} {capture "category_delete_dialog"} @@ -270,6 +431,26 @@ form_action = {url path='/admin/categories/delete'} form_content = {$smarty.capture.category_delete_dialog nofilter} } + + {* Delete product confirmation dialog *} + + {capture "product_delete_dialog"} + + + {module_include location='product_delete_form'} + + {/capture} + + {include + file = "includes/generic-confirm-dialog.html" + + dialog_id = "product_delete_dialog" + dialog_title = {intl l="Delete product"} + dialog_message = {intl l="Do you really want to delete this product ?"} + + form_action = {url path='/admin/products/delete'} + form_content = {$smarty.capture.product_delete_dialog nofilter} + } {/block} {block name="javascript-initialization"} @@ -290,6 +471,11 @@ $('#category_delete_id').val($(this).data('id')); }); + // Set proper product ID in delete from + $('a.product-delete').click(function(ev) { + $('#product_delete_id').val($(this).data('id')); + }); + // JS stuff for creation form {include file = "includes/generic-js-dialog.html" From c8baa38fed2dafeddc2adcbe1da761793ddcda4c Mon Sep 17 00:00:00 2001 From: franck Date: Tue, 17 Sep 2013 17:31:22 +0200 Subject: [PATCH 50/74] Added missing files... --- core/lib/Thelia/Action/Product.php | 199 ++++++++++ .../Controller/Admin/ProductController.php | 350 ++++++++++++++++++ .../Core/Event/ProductAddContentEvent.php | 48 +++ .../Thelia/Core/Event/ProductCreateEvent.php | 80 ++++ .../Core/Event/ProductDeleteContentEvent.php | 48 +++ .../Thelia/Core/Event/ProductDeleteEvent.php | 44 +++ core/lib/Thelia/Core/Event/ProductEvent.php | 54 +++ .../Event/ProductToggleVisibilityEvent.php | 28 ++ .../Thelia/Core/Event/ProductUpdateEvent.php | 113 ++++++ .../Thelia/Form/ProductModificationForm.php | 64 ++++ core/lib/Thelia/Model/Product.php | 21 +- 11 files changed, 1042 insertions(+), 7 deletions(-) create mode 100644 core/lib/Thelia/Action/Product.php create mode 100644 core/lib/Thelia/Controller/Admin/ProductController.php create mode 100644 core/lib/Thelia/Core/Event/ProductAddContentEvent.php create mode 100644 core/lib/Thelia/Core/Event/ProductCreateEvent.php create mode 100644 core/lib/Thelia/Core/Event/ProductDeleteContentEvent.php create mode 100644 core/lib/Thelia/Core/Event/ProductDeleteEvent.php create mode 100644 core/lib/Thelia/Core/Event/ProductEvent.php create mode 100644 core/lib/Thelia/Core/Event/ProductToggleVisibilityEvent.php create mode 100644 core/lib/Thelia/Core/Event/ProductUpdateEvent.php create mode 100644 core/lib/Thelia/Form/ProductModificationForm.php diff --git a/core/lib/Thelia/Action/Product.php b/core/lib/Thelia/Action/Product.php new file mode 100644 index 000000000..d2deb7688 --- /dev/null +++ b/core/lib/Thelia/Action/Product.php @@ -0,0 +1,199 @@ +. */ +/* */ +/*************************************************************************************/ + +namespace Thelia\Action; + +use Symfony\Component\EventDispatcher\EventSubscriberInterface; + +use Thelia\Model\ProductQuery; +use Thelia\Model\Product as ProductModel; + +use Thelia\Core\Event\TheliaEvents; + +use Thelia\Core\Event\ProductUpdateEvent; +use Thelia\Core\Event\ProductCreateEvent; +use Thelia\Core\Event\ProductDeleteEvent; +use Thelia\Model\ConfigQuery; +use Thelia\Core\Event\UpdatePositionEvent; +use Thelia\Core\Event\ProductToggleVisibilityEvent; +use Thelia\Core\Event\ProductAddContentEvent; +use Thelia\Core\Event\ProductDeleteContentEvent; +use Thelia\Model\ProductAssociatedContent; +use Thelia\Model\ProductAssociatedContentQuery; + +class Product extends BaseAction implements EventSubscriberInterface +{ + /** + * Create a new product entry + * + * @param ProductCreateEvent $event + */ + public function create(ProductCreateEvent $event) + { + $product = new ProductModel(); + + $product + ->setDispatcher($this->getDispatcher()) + + ->setLocale($event->getLocale()) + ->setTitle($event->getTitle()) + ->setParent($event->getParent()) + ->setVisible($event->getVisible()) + + ->save() + ; + + $event->setProduct($product); + } + + /** + * Change a product + * + * @param ProductUpdateEvent $event + */ + public function update(ProductUpdateEvent $event) + { + $search = ProductQuery::create(); + + if (null !== $product = ProductQuery::create()->findPk($event->getProductId())) { + + $product + ->setDispatcher($this->getDispatcher()) + + ->setLocale($event->getLocale()) + ->setTitle($event->getTitle()) + ->setDescription($event->getDescription()) + ->setChapo($event->getChapo()) + ->setPostscriptum($event->getPostscriptum()) + + ->setParent($event->getParent()) + ->setVisible($event->getVisible()) + + ->save(); + + $event->setProduct($product); + } + } + + /** + * Delete a product entry + * + * @param ProductDeleteEvent $event + */ + public function delete(ProductDeleteEvent $event) + { + if (null !== $product = ProductQuery::create()->findPk($event->getProductId())) { + + $product + ->setDispatcher($this->getDispatcher()) + ->delete() + ; + + $event->setProduct($product); + } + } + + /** + * Toggle product visibility. No form used here + * + * @param ActionEvent $event + */ + public function toggleVisibility(ProductToggleVisibilityEvent $event) + { + $product = $event->getProduct(); + + $product + ->setDispatcher($this->getDispatcher()) + ->setVisible($product->getVisible() ? false : true) + ->save() + ; + } + + /** + * Changes position, selecting absolute ou relative change. + * + * @param ProductChangePositionEvent $event + */ + public function updatePosition(UpdatePositionEvent $event) + { + if (null !== $product = ProductQuery::create()->findPk($event->getObjectId())) { + + $product->setDispatcher($this->getDispatcher()); + + $mode = $event->getMode(); + + if ($mode == UpdatePositionEvent::POSITION_ABSOLUTE) + return $product->changeAbsolutePosition($event->getPosition()); + else if ($mode == UpdatePositionEvent::POSITION_UP) + return $product->movePositionUp(); + else if ($mode == UpdatePositionEvent::POSITION_DOWN) + return $product->movePositionDown(); + } + } + + public function addContent(ProductAddContentEvent $event) { + + if (ProductAssociatedContentQuery::create() + ->filterByContentId($event->getContentId()) + ->filterByProduct($event->getProduct())->count() <= 0) { + + $content = new ProductAssociatedContent(); + + $content + ->setProduct($event->getProduct()) + ->setContentId($event->getContentId()) + ->save() + ; + } + } + + public function removeContent(ProductDeleteContentEvent $event) { + + $content = ProductAssociatedContentQuery::create() + ->filterByContentId($event->getContentId()) + ->filterByProduct($event->getProduct())->findOne() + ; + + if ($content !== null) $content->delete(); + } + + + /** + * {@inheritDoc} + */ + public static function getSubscribedEvents() + { + return array( + TheliaEvents::PRODUCT_CREATE => array("create", 128), + TheliaEvents::PRODUCT_UPDATE => array("update", 128), + TheliaEvents::PRODUCT_DELETE => array("delete", 128), + TheliaEvents::PRODUCT_TOGGLE_VISIBILITY => array("toggleVisibility", 128), + + TheliaEvents::PRODUCT_UPDATE_POSITION => array("updatePosition", 128), + + TheliaEvents::PRODUCT_ADD_CONTENT => array("addContent", 128), + TheliaEvents::PRODUCT_REMOVE_CONTENT => array("removeContent", 128), + + ); + } +} diff --git a/core/lib/Thelia/Controller/Admin/ProductController.php b/core/lib/Thelia/Controller/Admin/ProductController.php new file mode 100644 index 000000000..e1b651e60 --- /dev/null +++ b/core/lib/Thelia/Controller/Admin/ProductController.php @@ -0,0 +1,350 @@ +. */ +/* */ +/*************************************************************************************/ + +namespace Thelia\Controller\Admin; + +use Thelia\Core\Event\ProductDeleteEvent; +use Thelia\Core\Event\TheliaEvents; +use Thelia\Core\Event\ProductUpdateEvent; +use Thelia\Core\Event\ProductCreateEvent; +use Thelia\Model\ProductQuery; +use Thelia\Form\ProductModificationForm; +use Thelia\Form\ProductCreationForm; +use Thelia\Core\Event\UpdatePositionEvent; +use Thelia\Core\Event\ProductToggleVisibilityEvent; +use Thelia\Core\Event\ProductDeleteContentEvent; +use Thelia\Core\Event\ProductAddContentEvent; +use Thelia\Model\ProductAssociatedContent; +use Thelia\Model\FolderQuery; +use Thelia\Model\ContentQuery; +use Propel\Runtime\ActiveQuery\Criteria; +use Thelia\Model\ProductAssociatedContentQuery; + +/** + * Manages products + * + * @author Franck Allimant + */ +class ProductController extends AbstractCrudController +{ + public function __construct() + { + parent::__construct( + 'product', + 'manual', + 'product_order', + + 'admin.products.default', + 'admin.products.create', + 'admin.products.update', + 'admin.products.delete', + + TheliaEvents::PRODUCT_CREATE, + TheliaEvents::PRODUCT_UPDATE, + TheliaEvents::PRODUCT_DELETE, + + TheliaEvents::PRODUCT_TOGGLE_VISIBILITY, + TheliaEvents::PRODUCT_UPDATE_POSITION + ); + } + + protected function getCreationForm() + { + return new ProductCreationForm($this->getRequest()); + } + + protected function getUpdateForm() + { + return new ProductModificationForm($this->getRequest()); + } + + protected function getCreationEvent($formData) + { + $createEvent = new ProductCreateEvent(); + + $createEvent + ->setTitle($formData['title']) + ->setLocale($formData["locale"]) + ->setParent($formData['parent']) + ->setVisible($formData['visible']) + ; + + return $createEvent; + } + + protected function getUpdateEvent($formData) + { + $changeEvent = new ProductUpdateEvent($formData['id']); + + // Create and dispatch the change event + $changeEvent + ->setLocale($formData['locale']) + ->setTitle($formData['title']) + ->setChapo($formData['chapo']) + ->setDescription($formData['description']) + ->setPostscriptum($formData['postscriptum']) + ->setVisible($formData['visible']) + ->setUrl($formData['url']) + ->setParent($formData['parent']) + ; + + return $changeEvent; + } + + protected function createUpdatePositionEvent($positionChangeMode, $positionValue) + { + return new UpdatePositionEvent( + $this->getRequest()->get('product_id', null), + $positionChangeMode, + $positionValue + ); + } + + protected function getDeleteEvent() + { + return new ProductDeleteEvent($this->getRequest()->get('product_id', 0)); + } + + protected function eventContainsObject($event) + { + return $event->hasProduct(); + } + + protected function hydrateObjectForm($object) + { + // Prepare the data that will hydrate the form + $data = array( + 'id' => $object->getId(), + 'locale' => $object->getLocale(), + 'title' => $object->getTitle(), + 'chapo' => $object->getChapo(), + 'description' => $object->getDescription(), + 'postscriptum' => $object->getPostscriptum(), + 'visible' => $object->getVisible(), + 'url' => $object->getRewritenUrl($this->getCurrentEditionLocale()), + 'parent' => $object->getParent() + ); + + // Setup the object form + return new ProductModificationForm($this->getRequest(), "form", $data); + } + + protected function getObjectFromEvent($event) + { + return $event->hasProduct() ? $event->getProduct() : null; + } + + protected function getExistingObject() + { + return ProductQuery::create() + ->joinWithI18n($this->getCurrentEditionLocale()) + ->findOneById($this->getRequest()->get('product_id', 0)); + } + + protected function getObjectLabel($object) + { + return $object->getTitle(); + } + + protected function getObjectId($object) + { + return $object->getId(); + } + + protected function getEditionArguments() + { + return array( + 'product_id' => $this->getRequest()->get('product_id', 0), + 'folder_id' => $this->getRequest()->get('folder_id', 0), + 'current_tab' => $this->getRequest()->get('current_tab', 'general') + ); + } + + protected function renderListTemplate($currentOrder) + { + $this->getListOrderFromSession('product', 'product_order', 'manual'); + + return $this->render('categories', + array( + 'product_order' => $currentOrder, + 'product_id' => $this->getRequest()->get('product_id', 0) + )); + } + + protected function redirectToListTemplate() + { + // Redirect to the product default category list + $product = $this->getExistingObject(); + + $this->redirectToRoute( + 'admin.products.default', + array('category_id' => $product != null ? $product->getDefaultCategory() : 0) + ); + } + + protected function renderEditionTemplate() + { + return $this->render('product-edit', $this->getEditionArguments()); + } + + protected function redirectToEditionTemplate() + { + $this->redirectToRoute("admin.products.update", $this->getEditionArguments()); + } + + /** + * Online status toggle product + */ + public function setToggleVisibilityAction() + { + // Check current user authorization + if (null !== $response = $this->checkAuth("admin.products.update")) return $response; + + $event = new ProductToggleVisibilityEvent($this->getExistingObject()); + + try { + $this->dispatch(TheliaEvents::PRODUCT_TOGGLE_VISIBILITY, $event); + } catch (\Exception $ex) { + // Any error + return $this->errorPage($ex); + } + + // Ajax response -> no action + return $this->nullResponse(); + } + + protected function performAdditionalDeleteAction($deleteEvent) + { + // Redirect to parent product list + $this->redirectToRoute( + 'admin.products.default', + array('category_id' => $deleteEvent->getProduct()->getDefaultCategory()) + ); + } + + protected function performAdditionalUpdateAction($updateEvent) + { + if ($this->getRequest()->get('save_mode') != 'stay') { + + // Redirect to parent product list + $this->redirectToRoute( + 'admin.categories.default', + array('category_id' => $product->getDefaultCategory()) + ); + } + } + + protected function performAdditionalUpdatePositionAction($event) + { + $product = ProductQuery::create()->findPk($event->getObjectId()); + + if ($product != null) { + // Redirect to parent product list + $this->redirectToRoute( + 'admin.categories.default', + array('category_id' => $product->getDefaultCategory()) + ); + } + + return null; + } + + public function getAvailableRelatedContentAction($productId, $folderId) + { + $result = array(); + + $folders = FolderQuery::create()->filterById($folderId)->find(); + + if ($folders !== null) { + + $list = ContentQuery::create() + ->joinWithI18n($this->getCurrentEditionLocale()) + ->filterByFolder($folders, Criteria::IN) + ->filterById(ProductAssociatedContentQuery::create()->select('content_id')->findByProductId($productId), Criteria::NOT_IN) + ->find(); + ; + + if ($list !== null) { + foreach($list as $item) { + $result[] = array('id' => $item->getId(), 'title' => $item->getTitle()); + } + } + } + + return $this->jsonResponse(json_encode($result)); + } + + public function addRelatedContentAction() + { + + // Check current user authorization + if (null !== $response = $this->checkAuth("admin.products.update")) return $response; + + $content_id = intval($this->getRequest()->get('content_id')); + + if ($content_id > 0) { + + $event = new ProductAddContentEvent( + $this->getExistingObject(), + $content_id + ); + + try { + $this->dispatch(TheliaEvents::PRODUCT_ADD_CONTENT, $event); + } + catch (\Exception $ex) { + // Any error + return $this->errorPage($ex); + } + } + + $this->redirectToEditionTemplate(); + } + + public function deleteRelatedContentAction() + { + + // Check current user authorization + if (null !== $response = $this->checkAuth("admin.products.update")) return $response; + + $content_id = intval($this->getRequest()->get('content_id')); + + if ($content_id > 0) { + + $event = new ProductDeleteContentEvent( + $this->getExistingObject(), + $content_id + ); + + try { + $this->dispatch(TheliaEvents::PRODUCT_REMOVE_CONTENT, $event); + } + catch (\Exception $ex) { + // Any error + return $this->errorPage($ex); + } + } + + $this->redirectToEditionTemplate(); + } +} diff --git a/core/lib/Thelia/Core/Event/ProductAddContentEvent.php b/core/lib/Thelia/Core/Event/ProductAddContentEvent.php new file mode 100644 index 000000000..8cd648753 --- /dev/null +++ b/core/lib/Thelia/Core/Event/ProductAddContentEvent.php @@ -0,0 +1,48 @@ +. */ +/* */ +/*************************************************************************************/ + +namespace Thelia\Core\Event; + +use Thelia\Model\Product; + +class ProductAddContentEvent extends ProductEvent +{ + protected $content_id; + + public function __construct(Product $product, $content_id) + { + parent::__construct($product); + + $this->content_id = $content_id; + } + + public function getContentId() + { + return $this->content_id; + } + + public function setContentId($content_id) + { + $this->content_id = $content_id; + } +} diff --git a/core/lib/Thelia/Core/Event/ProductCreateEvent.php b/core/lib/Thelia/Core/Event/ProductCreateEvent.php new file mode 100644 index 000000000..51be86e25 --- /dev/null +++ b/core/lib/Thelia/Core/Event/ProductCreateEvent.php @@ -0,0 +1,80 @@ +. */ +/* */ +/*************************************************************************************/ + +namespace Thelia\Core\Event; + +class ProductCreateEvent extends ProductEvent +{ + protected $title; + protected $parent; + protected $locale; + protected $visible; + + public function getTitle() + { + return $this->title; + } + + public function setTitle($title) + { + $this->title = $title; + + return $this; + } + + public function getParent() + { + return $this->parent; + } + + public function setParent($parent) + { + $this->parent = $parent; + + return $this; + } + + public function getLocale() + { + return $this->locale; + } + + public function setLocale($locale) + { + $this->locale = $locale; + + return $this; + } + + public function getVisible() + { + return $this->visible; + } + + public function setVisible($visible) + { + $this->visible = $visible; + + return $this; + } +} diff --git a/core/lib/Thelia/Core/Event/ProductDeleteContentEvent.php b/core/lib/Thelia/Core/Event/ProductDeleteContentEvent.php new file mode 100644 index 000000000..f3cdbda1f --- /dev/null +++ b/core/lib/Thelia/Core/Event/ProductDeleteContentEvent.php @@ -0,0 +1,48 @@ +. */ +/* */ +/*************************************************************************************/ + +namespace Thelia\Core\Event; + +use Thelia\Model\Product; + +class ProductDeleteContentEvent extends ProductEvent +{ + protected $content_id; + + public function __construct(Product $product, $content_id) + { + parent::__construct($product); + + $this->content_id = $content_id; + } + + public function getContentId() + { + return $this->content_id; + } + + public function setContentId($content_id) + { + $this->content_id = $content_id; + } +} diff --git a/core/lib/Thelia/Core/Event/ProductDeleteEvent.php b/core/lib/Thelia/Core/Event/ProductDeleteEvent.php new file mode 100644 index 000000000..43273887c --- /dev/null +++ b/core/lib/Thelia/Core/Event/ProductDeleteEvent.php @@ -0,0 +1,44 @@ +. */ +/* */ +/*************************************************************************************/ + +namespace Thelia\Core\Event; + +class ProductDeleteEvent extends ProductEvent +{ + public function __construct($product_id) + { + $this->product_id = $product_id; + } + + public function getProductId() + { + return $this->product_id; + } + + public function setProductId($product_id) + { + $this->product_id = $product_id; + + return $this; + } +} diff --git a/core/lib/Thelia/Core/Event/ProductEvent.php b/core/lib/Thelia/Core/Event/ProductEvent.php new file mode 100644 index 000000000..6decd8101 --- /dev/null +++ b/core/lib/Thelia/Core/Event/ProductEvent.php @@ -0,0 +1,54 @@ +. */ +/* */ +/*************************************************************************************/ + +namespace Thelia\Core\Event; + +use Thelia\Model\Product; +use Thelia\Core\Event\ActionEvent; + +class ProductEvent extends ActionEvent +{ + public $product = null; + + public function __construct(Product $product = null) + { + $this->product = $product; + } + + public function hasProduct() + { + return ! is_null($this->product); + } + + public function getProduct() + { + return $this->product; + } + + public function setProduct(Product $product) + { + $this->product = $product; + + return $this; + } +} diff --git a/core/lib/Thelia/Core/Event/ProductToggleVisibilityEvent.php b/core/lib/Thelia/Core/Event/ProductToggleVisibilityEvent.php new file mode 100644 index 000000000..732cfac76 --- /dev/null +++ b/core/lib/Thelia/Core/Event/ProductToggleVisibilityEvent.php @@ -0,0 +1,28 @@ +. */ +/* */ +/*************************************************************************************/ + +namespace Thelia\Core\Event; + +class ProductToggleVisibilityEvent extends ProductEvent +{ +} diff --git a/core/lib/Thelia/Core/Event/ProductUpdateEvent.php b/core/lib/Thelia/Core/Event/ProductUpdateEvent.php new file mode 100644 index 000000000..8ade33c74 --- /dev/null +++ b/core/lib/Thelia/Core/Event/ProductUpdateEvent.php @@ -0,0 +1,113 @@ +. */ +/* */ +/*************************************************************************************/ + +namespace Thelia\Core\Event; + +class ProductUpdateEvent extends ProductCreateEvent +{ + protected $product_id; + + protected $chapo; + protected $description; + protected $postscriptum; + + protected $url; + protected $parent; + + public function __construct($product_id) + { + $this->product_id = $product_id; + } + + public function getProductId() + { + return $this->product_id; + } + + public function setProductId($product_id) + { + $this->product_id = $product_id; + + return $this; + } + + public function getChapo() + { + return $this->chapo; + } + + public function setChapo($chapo) + { + $this->chapo = $chapo; + + return $this; + } + + public function getDescription() + { + return $this->description; + } + + public function setDescription($description) + { + $this->description = $description; + + return $this; + } + + public function getPostscriptum() + { + return $this->postscriptum; + } + + public function setPostscriptum($postscriptum) + { + $this->postscriptum = $postscriptum; + + return $this; + } + + public function getUrl() + { + return $this->url; + } + + public function setUrl($url) + { + $this->url = $url; + + return $this; + } + + public function getParent() + { + return $this->parent; + } + + public function setParent($parent) + { + $this->parent = $parent; + + return $this; + } +} diff --git a/core/lib/Thelia/Form/ProductModificationForm.php b/core/lib/Thelia/Form/ProductModificationForm.php new file mode 100644 index 000000000..dbda15eaa --- /dev/null +++ b/core/lib/Thelia/Form/ProductModificationForm.php @@ -0,0 +1,64 @@ +. */ +/* */ +/*************************************************************************************/ +namespace Thelia\Form; + +use Symfony\Component\Validator\Constraints\GreaterThan; +use Thelia\Core\Translation\Translator; +use Symfony\Component\Validator\Constraints\NotBlank; + +class ProductModificationForm extends ProductCreationForm +{ + use StandardDescriptionFieldsTrait; + + protected function buildForm() + { + parent::buildForm(true); + + $this->formBuilder + ->add("id", "integer", array( + "label" => Translator::getInstance()->trans("Prodcut ID *"), + "label_attr" => array("for" => "product_id_field"), + "constraints" => array(new GreaterThan(array('value' => 0))) + + )) + ->add("template_id", "integer", array( + "label" => Translator::getInstance()->trans("Product template"), + "label_attr" => array("for" => "product_template_field") + + )) + ->add("url", "text", array( + "label" => Translator::getInstance()->trans("Rewriten URL *"), + "constraints" => array(new NotBlank()), + "label_attr" => array("for" => "rewriten_url_field") + )) + ; + + // Add standard description fields, excluding title and locale, which a re defined in parent class + $this->addStandardDescFields(array('title', 'locale')); + } + + public function getName() + { + return "thelia_product_modification"; + } +} \ No newline at end of file diff --git a/core/lib/Thelia/Model/Product.php b/core/lib/Thelia/Model/Product.php index c770379b9..87b414dd9 100755 --- a/core/lib/Thelia/Model/Product.php +++ b/core/lib/Thelia/Model/Product.php @@ -46,7 +46,8 @@ class Product extends BaseProduct /** * @return the current default category for this product */ - public function getDefaultCategory() { + public function getDefaultCategory() + { // Find default category $default_category = ProductCategoryQuery::create() ->filterByProductId($this->getId()) @@ -61,8 +62,8 @@ class Product extends BaseProduct * * @param integer $categoryId the new default category id */ - public function setDefaultCategory($categoryId) { - + public function setDefaultCategory($categoryId) + { // Unset previous category ProductCategoryQuery::create() ->filterByProductId($this->getId()) @@ -85,11 +86,17 @@ class Product extends BaseProduct /** * Calculate next position relative to our default category */ - protected function addCriteriaToPositionQuery($query) { - - // TODO: Find the default category for this product, - // and generate the position relative to this category + protected function addCriteriaToPositionQuery($query) + { + // Retrourver les produits qui ont la même categorie par defaut + $produits = ProductCategoryQuery::create() + ->filterByCategory($this->getDefaultCategory()) + ->filterByDefaultCategory(true) + ->select('product_id') + ->find(); + // Filtrer la requete sur ces produits + if ($produits != null) $query->filterById($produits); } /** From 82c7cdeb4483f383115791ba33b5add7978e1c29 Mon Sep 17 00:00:00 2001 From: gmorel Date: Tue, 17 Sep 2013 17:39:12 +0200 Subject: [PATCH 51/74] Working : Content : fix loop giving no elements --- core/lib/Thelia/Core/Template/Loop/Product.php | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/core/lib/Thelia/Core/Template/Loop/Product.php b/core/lib/Thelia/Core/Template/Loop/Product.php index d0d8dc5b7..489587a71 100755 --- a/core/lib/Thelia/Core/Template/Loop/Product.php +++ b/core/lib/Thelia/Core/Template/Loop/Product.php @@ -175,14 +175,17 @@ class Product extends BaseI18nLoop if (!is_null($category) ||!is_null($categoryDefault)) { - $categories = array(); - if (!is_null($category)) { - $categories = array_merge($categories, CategoryQuery::create()->filterById($category, Criteria::IN)->find()); + $categoryIds = array(); + if (!is_array($category)) { + $category = array(); } - if (!is_null($categoryDefault)) { - $categories = array_merge($categories, CategoryQuery::create()->filterById($categoryDefault, Criteria::IN)->find()); + if (!is_array($categoryDefault)) { + $categoryDefault = array(); } + $categoryIds = array_merge($categoryIds, $category, $categoryDefault); + $categories =CategoryQuery::create()->filterById($categoryIds, Criteria::IN)->find(); + $depth = $this->getDepth(); if (null !== $depth) { @@ -549,12 +552,12 @@ class Product extends BaseI18nLoop $search->addDescendingOrderByColumn('real_lowest_price'); break; case "manual": - if(null === $category || count($category) != 1) + if(null === $categoryIds || count($categoryIds) != 1) throw new \InvalidArgumentException('Manual order cannot be set without single category argument'); $search->orderByPosition(Criteria::ASC); break; case "manual_reverse": - if(null === $category || count($category) != 1) + if(null === $categoryIds || count($categoryIds) != 1) throw new \InvalidArgumentException('Manual order cannot be set without single category argument'); $search->orderByPosition(Criteria::DESC); break; From c99e7a91b93eec96e8a8fb0cd7c8f97536e73138 Mon Sep 17 00:00:00 2001 From: gmorel Date: Tue, 17 Sep 2013 17:43:19 +0200 Subject: [PATCH 52/74] Working : Content : fix loop giving no elements --- .../lib/Thelia/Core/Template/Loop/Content.php | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/core/lib/Thelia/Core/Template/Loop/Content.php b/core/lib/Thelia/Core/Template/Loop/Content.php index 4ac061c3f..a29cb2e60 100755 --- a/core/lib/Thelia/Core/Template/Loop/Content.php +++ b/core/lib/Thelia/Core/Template/Loop/Content.php @@ -102,15 +102,16 @@ class Content extends BaseI18nLoop if (!is_null($folder) || !is_null($folderDefault)) { - $folders = array(); - if (!is_null($folder)) { - $folders = array_merge($folders, FolderQuery::create()->filterById($folder, Criteria::IN)->find()); - } - - if (!is_null($folderDefault)) { - $folders = array_merge(FolderQuery::create()->filterById($folderDefault, Criteria::IN)->find()); + $foldersIds = array(); + if (!is_array($folder)) { + $folder = array(); + } + if (!is_array($folderDefault)) { + $folderDefault = array(); } + $foldersIds = array_merge($foldersIds, $folder, $folderDefault); + $folders =FolderQuery::create()->filterById($foldersIds, Criteria::IN)->find(); $depth = $this->getDepth(); @@ -175,12 +176,12 @@ class Content extends BaseI18nLoop $search->addDescendingOrderByColumn('i18n_TITLE'); break; case "manual": - if(null === $folder || count($folder) != 1) + if(null === $foldersIds || count($foldersIds) != 1) throw new \InvalidArgumentException('Manual order cannot be set without single folder argument'); $search->orderByPosition(Criteria::ASC); break; case "manual_reverse": - if(null === $folder || count($folder) != 1) + if(null === $foldersIds || count($foldersIds) != 1) throw new \InvalidArgumentException('Manual order cannot be set without single folder argument'); $search->orderByPosition(Criteria::DESC); break; From 50212c55cf50a55f702b863fec3d5cac3fb83f59 Mon Sep 17 00:00:00 2001 From: Manuel Raynaud Date: Tue, 17 Sep 2013 17:50:05 +0200 Subject: [PATCH 53/74] remove old model classes: --- core/lib/Thelia/Model/Rewriting.php | 9 -------- core/lib/Thelia/Model/RewritingQuery.php | 20 ---------------- .../Thelia/Model/Tools/UrlRewritingTrait.php | 23 ++++++++++++++++++- 3 files changed, 22 insertions(+), 30 deletions(-) delete mode 100644 core/lib/Thelia/Model/Rewriting.php delete mode 100644 core/lib/Thelia/Model/RewritingQuery.php diff --git a/core/lib/Thelia/Model/Rewriting.php b/core/lib/Thelia/Model/Rewriting.php deleted file mode 100644 index 8d6f75fab..000000000 --- a/core/lib/Thelia/Model/Rewriting.php +++ /dev/null @@ -1,9 +0,0 @@ -generateRewritenUrl($this->getRewritenUrlViewName(), $this->getId(), $locale, $this->getTitle()); + // Borrowed from http://stackoverflow.com/questions/2668854/sanitizing-strings-to-make-them-url-and-filename-safe + + $this->setLocale($locale); + // Replace all weird characters with dashes + $string = preg_replace('/[^\w\-~_\.]+/u', '-', $this->getTitle()); + + // Only allow one dash separator at a time (and make string lowercase) + $cleanString = mb_strtolower(preg_replace('/--+/u', '-', $string), 'UTF-8'); + + $urlFilePart = $cleanString . ".html"; + + // TODO : + // check if URL url already exists, and add a numeric suffix, or the like + try{ + URL::getInstance()->resolve($urlFilePart); + } catch (UrlRewritingException $e) { + + } + // insert the URL in the rewriting table + //URL::getInstance()->generateRewritenUrl($this->getRewritenUrlViewName(), $this->getId(), $locale, $this->getTitle()); } /** From ecf4412fbd0e8d0a296fc3df41572a5aef6976b3 Mon Sep 17 00:00:00 2001 From: franck Date: Tue, 17 Sep 2013 18:38:49 +0200 Subject: [PATCH 54/74] Changed getDefaultCategory in getDefaultCategoryId --- core/lib/Thelia/Model/Product.php | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/core/lib/Thelia/Model/Product.php b/core/lib/Thelia/Model/Product.php index 87b414dd9..541668ddb 100755 --- a/core/lib/Thelia/Model/Product.php +++ b/core/lib/Thelia/Model/Product.php @@ -9,6 +9,7 @@ use Thelia\TaxEngine\Calculator; use Propel\Runtime\Connection\ConnectionInterface; use Thelia\Core\Event\TheliaEvents; use Thelia\Core\Event\ProductEvent; +use Propel\Runtime\ActiveQuery\Criteria; class Product extends BaseProduct { @@ -46,7 +47,7 @@ class Product extends BaseProduct /** * @return the current default category for this product */ - public function getDefaultCategory() + public function getDefaultCategoryId() { // Find default category $default_category = ProductCategoryQuery::create() @@ -54,7 +55,7 @@ class Product extends BaseProduct ->filterByDefaultCategory(true) ->findOne(); - return $default_category; + return $default_category == null ? 0 : $default_category->getCategoryId(); } /** @@ -88,15 +89,15 @@ class Product extends BaseProduct */ protected function addCriteriaToPositionQuery($query) { - // Retrourver les produits qui ont la même categorie par defaut + // Find products in the same category $produits = ProductCategoryQuery::create() - ->filterByCategory($this->getDefaultCategory()) + ->filterByCategoryId($this->getDefaultCategoryId()) ->filterByDefaultCategory(true) ->select('product_id') ->find(); // Filtrer la requete sur ces produits - if ($produits != null) $query->filterById($produits); + if ($produits != null) $query->filterById($produits, Criteria::IN); } /** From 60d09dc76e86c96f7690815850f7db727a848aaa Mon Sep 17 00:00:00 2001 From: Manuel Raynaud Date: Tue, 17 Sep 2013 19:11:44 +0200 Subject: [PATCH 55/74] refactor rewrriten method name --- core/lib/Thelia/Model/Category.php | 4 +- core/lib/Thelia/Model/Content.php | 4 +- core/lib/Thelia/Model/Folder.php | 4 +- core/lib/Thelia/Model/Product.php | 4 +- core/lib/Thelia/Model/RewritingUrl.php | 17 +++++ .../Thelia/Model/Tools/UrlRewritingTrait.php | 63 +++++++++++++++---- 6 files changed, 76 insertions(+), 20 deletions(-) diff --git a/core/lib/Thelia/Model/Category.php b/core/lib/Thelia/Model/Category.php index 042864de0..91b32eec7 100755 --- a/core/lib/Thelia/Model/Category.php +++ b/core/lib/Thelia/Model/Category.php @@ -28,7 +28,7 @@ class Category extends BaseCategory /** * {@inheritDoc} */ - protected function getRewritenUrlViewName() { + protected function getRewrittenUrlViewName() { return 'category'; } @@ -69,7 +69,7 @@ class Category extends BaseCategory { $this->setPosition($this->getNextPosition()); - $this->generateRewritenUrl($this->getLocale()); + $this->generateRewrittenUrl($this->getLocale()); $this->dispatchEvent(TheliaEvents::BEFORE_CREATECATEGORY, new CategoryEvent($this)); diff --git a/core/lib/Thelia/Model/Content.php b/core/lib/Thelia/Model/Content.php index 79660f93a..d626bfb10 100755 --- a/core/lib/Thelia/Model/Content.php +++ b/core/lib/Thelia/Model/Content.php @@ -17,7 +17,7 @@ class Content extends BaseContent /** * {@inheritDoc} */ - protected function getRewritenUrlViewName() { + protected function getRewrittenUrlViewName() { return 'content'; } @@ -37,7 +37,7 @@ class Content extends BaseContent { $this->setPosition($this->getNextPosition()); - $this->generateRewritenUrl($this->getLocale()); + $this->generateRewrittenUrl($this->getLocale()); return true; } diff --git a/core/lib/Thelia/Model/Folder.php b/core/lib/Thelia/Model/Folder.php index 1e73e7e23..318edb7ac 100755 --- a/core/lib/Thelia/Model/Folder.php +++ b/core/lib/Thelia/Model/Folder.php @@ -17,7 +17,7 @@ class Folder extends BaseFolder /** * {@inheritDoc} */ - protected function getRewritenUrlViewName() { + protected function getRewrittenUrlViewName() { return 'folder'; } @@ -67,7 +67,7 @@ class Folder extends BaseFolder { $this->setPosition($this->getNextPosition()); - $this->generateRewritenUrl($this->getLocale()); + $this->generateRewrittenUrl($this->getLocale()); return true; } diff --git a/core/lib/Thelia/Model/Product.php b/core/lib/Thelia/Model/Product.php index 87b414dd9..d227cc9a2 100755 --- a/core/lib/Thelia/Model/Product.php +++ b/core/lib/Thelia/Model/Product.php @@ -21,7 +21,7 @@ class Product extends BaseProduct /** * {@inheritDoc} */ - protected function getRewritenUrlViewName() { + protected function getRewrittenUrlViewName() { return 'product'; } @@ -106,7 +106,7 @@ class Product extends BaseProduct { $this->setPosition($this->getNextPosition()); - $this->generateRewritenUrl($this->getLocale()); + $this->generateRewrittenUrl($this->getLocale()); $this->dispatchEvent(TheliaEvents::BEFORE_CREATEPRODUCT, new ProductEvent($this)); diff --git a/core/lib/Thelia/Model/RewritingUrl.php b/core/lib/Thelia/Model/RewritingUrl.php index 58dde9388..9dd826d01 100644 --- a/core/lib/Thelia/Model/RewritingUrl.php +++ b/core/lib/Thelia/Model/RewritingUrl.php @@ -2,8 +2,25 @@ namespace Thelia\Model; +use Propel\Runtime\Connection\ConnectionInterface; use Thelia\Model\Base\RewritingUrl as BaseRewritingUrl; +use Thelia\Model\RewritingUrlQuery; class RewritingUrl extends BaseRewritingUrl { + public function preSave(ConnectionInterface $con = null) + { + if($this->getRedirected() == 0) { + //check if rewriting url alredy exists and put redirect to 1 + RewritingUrlQuery::create() + ->filterByView($this->getView()) + ->filterByViewId($this->getViewId()) + ->filterByViewLocale($this->getViewLocale()) + ->update(array( + "redirect" => 1 + )); + } + + return true; + } } diff --git a/core/lib/Thelia/Model/Tools/UrlRewritingTrait.php b/core/lib/Thelia/Model/Tools/UrlRewritingTrait.php index f50da56d5..c9154a0db 100644 --- a/core/lib/Thelia/Model/Tools/UrlRewritingTrait.php +++ b/core/lib/Thelia/Model/Tools/UrlRewritingTrait.php @@ -24,7 +24,8 @@ namespace Thelia\Model\Tools; use Thelia\Exception\UrlRewritingException; -use Thelia\Model\Rewriting; +use Thelia\Model\RewritingUrlQuery; +use Thelia\Model\RewritingUrl; use Thelia\Tools\URL; /** * A trait for managing Rewriten URLs from model classes @@ -34,7 +35,7 @@ trait UrlRewritingTrait { /** * @returns string the view name of the rewriten object (e.g., 'category', 'product') */ - protected abstract function getRewritenUrlViewName(); + protected abstract function getRewrittenUrlViewName(); /** * Get the object URL for the given locale, rewriten if rewriting is enabled. @@ -43,7 +44,7 @@ trait UrlRewritingTrait { */ public function getUrl($locale) { - return URL::getInstance()->retrieve($this->getRewritenUrlViewName(), $this->getId(), $locale)->toString(); + return URL::getInstance()->retrieve($this->getRewrittenUrlViewName(), $this->getId(), $locale)->toString(); } /** @@ -51,13 +52,22 @@ trait UrlRewritingTrait { * * @param string $locale a valid locale (e.g. en_US) */ - public function generateRewritenUrl($locale) + public function generateRewrittenUrl($locale) { + if ($this->isNew()) { + throw new \RuntimeException(sprintf('Object %s must be save before generating url', $this->getRewrittenUrlViewName())); + } // Borrowed from http://stackoverflow.com/questions/2668854/sanitizing-strings-to-make-them-url-and-filename-safe $this->setLocale($locale); + + $title = $this->getTitle(); + + if (null === $title) { + throw new \RuntimeException(sprintf('Impossible to generate url if title does not exists for the locale %s', $locale)); + } // Replace all weird characters with dashes - $string = preg_replace('/[^\w\-~_\.]+/u', '-', $this->getTitle()); + $string = preg_replace('/[^\w\-~_\.]+/u', '-', $title); // Only allow one dash separator at a time (and make string lowercase) $cleanString = mb_strtolower(preg_replace('/--+/u', '-', $string), 'UTF-8'); @@ -67,30 +77,59 @@ trait UrlRewritingTrait { // TODO : // check if URL url already exists, and add a numeric suffix, or the like try{ - URL::getInstance()->resolve($urlFilePart); + $i=0; + while(URL::getInstance()->resolve($urlFilePart)) { + $i++; + $urlFilePart = sprintf("%s-%d.html",$cleanString, $i); + } } catch (UrlRewritingException $e) { - + $rewritingUrl = new RewritingUrl(); + $rewritingUrl->setUrl($urlFilePart) + ->setView($this->getRewrittenUrlViewName()) + ->setViewId($this->getId()) + ->setViewLocale($locale) + ->setRedirected(0) + ->save() + ; } - // insert the URL in the rewriting table - //URL::getInstance()->generateRewritenUrl($this->getRewritenUrlViewName(), $this->getId(), $locale, $this->getTitle()); + + return $urlFilePart; + } /** * return the rewriten URL for the given locale * * @param string $locale a valid locale (e.g. en_US) + * @return null */ - public function getRewritenUrl($locale) + public function getRewrittenUrl($locale) { - return "fake url - TODO"; + $rewritingUrl = RewritingUrlQuery::create() + ->filterByViewLocale($locale) + ->filterByView($this->getRewrittenUrlViewName()) + ->filterByViewId($this->getId()) + ->filterByRedirected(0) + ->findOne() + ; + + if($rewritingUrl) { + $url = $rewritingUrl->getUrl(); + } else { + $url = null; + } + + return $url; } /** * Set the rewriten URL for the given locale * * @param string $locale a valid locale (e.g. en_US) + * @param $url the wanted url + * @return $this */ - public function setRewritenUrl($locale, $url) + public function setRewrittenUrl($locale, $url) { // TODO - code me ! From e1e383707b04f59ee33eb80fdb0b86e0b23bbf49 Mon Sep 17 00:00:00 2001 From: Manuel Raynaud Date: Tue, 17 Sep 2013 19:19:52 +0200 Subject: [PATCH 56/74] template is not mandatory in product table. --- core/lib/Thelia/Model/Base/ProductQuery.php | 4 +- core/lib/Thelia/Model/Base/Template.php | 9 +- core/lib/Thelia/Model/Base/TemplateQuery.php | 4 +- core/lib/Thelia/Model/Category.php | 3 +- core/lib/Thelia/Model/Content.php | 7 +- core/lib/Thelia/Model/Folder.php | 6 +- core/lib/Thelia/Model/Map/ProductTableMap.php | 2 +- .../Model/Map/ProductVersionTableMap.php | 2 +- core/lib/Thelia/Model/Product.php | 3 +- install/thelia.sql | 4 +- local/config/schema.xml | 2398 ++++++++--------- 11 files changed, 1225 insertions(+), 1217 deletions(-) diff --git a/core/lib/Thelia/Model/Base/ProductQuery.php b/core/lib/Thelia/Model/Base/ProductQuery.php index 9b1710f03..9c3b0759c 100644 --- a/core/lib/Thelia/Model/Base/ProductQuery.php +++ b/core/lib/Thelia/Model/Base/ProductQuery.php @@ -857,7 +857,7 @@ abstract class ProductQuery extends ModelCriteria * * @return ChildProductQuery The current query, for fluid interface */ - public function joinTemplate($relationAlias = null, $joinType = Criteria::INNER_JOIN) + public function joinTemplate($relationAlias = null, $joinType = Criteria::LEFT_JOIN) { $tableMap = $this->getTableMap(); $relationMap = $tableMap->getRelation('Template'); @@ -892,7 +892,7 @@ abstract class ProductQuery extends ModelCriteria * * @return \Thelia\Model\TemplateQuery A secondary query class using the current class as primary query */ - public function useTemplateQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN) + public function useTemplateQuery($relationAlias = null, $joinType = Criteria::LEFT_JOIN) { return $this ->joinTemplate($relationAlias, $joinType) diff --git a/core/lib/Thelia/Model/Base/Template.php b/core/lib/Thelia/Model/Base/Template.php index 77efa7ba0..08bb0f3a0 100644 --- a/core/lib/Thelia/Model/Base/Template.php +++ b/core/lib/Thelia/Model/Base/Template.php @@ -864,9 +864,10 @@ abstract class Template implements ActiveRecordInterface if ($this->productsScheduledForDeletion !== null) { if (!$this->productsScheduledForDeletion->isEmpty()) { - \Thelia\Model\ProductQuery::create() - ->filterByPrimaryKeys($this->productsScheduledForDeletion->getPrimaryKeys(false)) - ->delete($con); + foreach ($this->productsScheduledForDeletion as $product) { + // need to save related object because we set the relation to null + $product->save($con); + } $this->productsScheduledForDeletion = null; } } @@ -1553,7 +1554,7 @@ abstract class Template implements ActiveRecordInterface $this->productsScheduledForDeletion = clone $this->collProducts; $this->productsScheduledForDeletion->clear(); } - $this->productsScheduledForDeletion[]= clone $product; + $this->productsScheduledForDeletion[]= $product; $product->setTemplate(null); } diff --git a/core/lib/Thelia/Model/Base/TemplateQuery.php b/core/lib/Thelia/Model/Base/TemplateQuery.php index 506d7d943..98c588dd8 100644 --- a/core/lib/Thelia/Model/Base/TemplateQuery.php +++ b/core/lib/Thelia/Model/Base/TemplateQuery.php @@ -395,7 +395,7 @@ abstract class TemplateQuery extends ModelCriteria * * @return ChildTemplateQuery The current query, for fluid interface */ - public function joinProduct($relationAlias = null, $joinType = Criteria::INNER_JOIN) + public function joinProduct($relationAlias = null, $joinType = Criteria::LEFT_JOIN) { $tableMap = $this->getTableMap(); $relationMap = $tableMap->getRelation('Product'); @@ -430,7 +430,7 @@ abstract class TemplateQuery extends ModelCriteria * * @return \Thelia\Model\ProductQuery A secondary query class using the current class as primary query */ - public function useProductQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN) + public function useProductQuery($relationAlias = null, $joinType = Criteria::LEFT_JOIN) { return $this ->joinProduct($relationAlias, $joinType) diff --git a/core/lib/Thelia/Model/Category.php b/core/lib/Thelia/Model/Category.php index 91b32eec7..204896674 100755 --- a/core/lib/Thelia/Model/Category.php +++ b/core/lib/Thelia/Model/Category.php @@ -69,8 +69,6 @@ class Category extends BaseCategory { $this->setPosition($this->getNextPosition()); - $this->generateRewrittenUrl($this->getLocale()); - $this->dispatchEvent(TheliaEvents::BEFORE_CREATECATEGORY, new CategoryEvent($this)); return true; @@ -81,6 +79,7 @@ class Category extends BaseCategory */ public function postInsert(ConnectionInterface $con = null) { + //$this->generateRewrittenUrl($this->getLocale()); $this->dispatchEvent(TheliaEvents::AFTER_CREATECATEGORY, new CategoryEvent($this)); } diff --git a/core/lib/Thelia/Model/Content.php b/core/lib/Thelia/Model/Content.php index d626bfb10..4d9cf9f3a 100755 --- a/core/lib/Thelia/Model/Content.php +++ b/core/lib/Thelia/Model/Content.php @@ -37,8 +37,11 @@ class Content extends BaseContent { $this->setPosition($this->getNextPosition()); - $this->generateRewrittenUrl($this->getLocale()); - return true; } + + public function postInsert(ConnectionInterface $con = null) + { + //$this->generateRewrittenUrl($this->getLocale()); + } } diff --git a/core/lib/Thelia/Model/Folder.php b/core/lib/Thelia/Model/Folder.php index 318edb7ac..e32505d9d 100755 --- a/core/lib/Thelia/Model/Folder.php +++ b/core/lib/Thelia/Model/Folder.php @@ -67,8 +67,12 @@ class Folder extends BaseFolder { $this->setPosition($this->getNextPosition()); - $this->generateRewrittenUrl($this->getLocale()); return true; } + + public function postInsert(ConnectionInterface $con = null) + { + //$this->generateRewrittenUrl($this->getLocale()); + } } diff --git a/core/lib/Thelia/Model/Map/ProductTableMap.php b/core/lib/Thelia/Model/Map/ProductTableMap.php index 17c4585f0..59ac236ac 100644 --- a/core/lib/Thelia/Model/Map/ProductTableMap.php +++ b/core/lib/Thelia/Model/Map/ProductTableMap.php @@ -189,7 +189,7 @@ class ProductTableMap extends TableMap $this->addColumn('REF', 'Ref', 'VARCHAR', true, 255, null); $this->addColumn('VISIBLE', 'Visible', 'TINYINT', true, null, 0); $this->addColumn('POSITION', 'Position', 'INTEGER', true, null, null); - $this->addForeignKey('TEMPLATE_ID', 'TemplateId', 'INTEGER', 'template', 'ID', true, null, null); + $this->addForeignKey('TEMPLATE_ID', 'TemplateId', 'INTEGER', 'template', 'ID', false, null, null); $this->addColumn('CREATED_AT', 'CreatedAt', 'TIMESTAMP', false, null, null); $this->addColumn('UPDATED_AT', 'UpdatedAt', 'TIMESTAMP', false, null, null); $this->addColumn('VERSION', 'Version', 'INTEGER', false, null, 0); diff --git a/core/lib/Thelia/Model/Map/ProductVersionTableMap.php b/core/lib/Thelia/Model/Map/ProductVersionTableMap.php index 4e84b4db8..14d38a764 100644 --- a/core/lib/Thelia/Model/Map/ProductVersionTableMap.php +++ b/core/lib/Thelia/Model/Map/ProductVersionTableMap.php @@ -180,7 +180,7 @@ class ProductVersionTableMap extends TableMap $this->addColumn('REF', 'Ref', 'VARCHAR', true, 255, null); $this->addColumn('VISIBLE', 'Visible', 'TINYINT', true, null, 0); $this->addColumn('POSITION', 'Position', 'INTEGER', true, null, null); - $this->addColumn('TEMPLATE_ID', 'TemplateId', 'INTEGER', true, null, null); + $this->addColumn('TEMPLATE_ID', 'TemplateId', 'INTEGER', false, null, null); $this->addColumn('CREATED_AT', 'CreatedAt', 'TIMESTAMP', false, null, null); $this->addColumn('UPDATED_AT', 'UpdatedAt', 'TIMESTAMP', false, null, null); $this->addPrimaryKey('VERSION', 'Version', 'INTEGER', true, null, 0); diff --git a/core/lib/Thelia/Model/Product.php b/core/lib/Thelia/Model/Product.php index 2be99958c..be534298e 100755 --- a/core/lib/Thelia/Model/Product.php +++ b/core/lib/Thelia/Model/Product.php @@ -107,7 +107,7 @@ class Product extends BaseProduct { $this->setPosition($this->getNextPosition()); - $this->generateRewrittenUrl($this->getLocale()); + $this->dispatchEvent(TheliaEvents::BEFORE_CREATEPRODUCT, new ProductEvent($this)); @@ -119,6 +119,7 @@ class Product extends BaseProduct */ public function postInsert(ConnectionInterface $con = null) { + //$this->generateRewrittenUrl($this->getLocale()); $this->dispatchEvent(TheliaEvents::AFTER_CREATEPRODUCT, new ProductEvent($this)); } diff --git a/install/thelia.sql b/install/thelia.sql index 3dc5d0454..b49840d9b 100755 --- a/install/thelia.sql +++ b/install/thelia.sql @@ -36,7 +36,7 @@ CREATE TABLE `product` `ref` VARCHAR(255) NOT NULL, `visible` TINYINT DEFAULT 0 NOT NULL, `position` INTEGER NOT NULL, - `template_id` INTEGER NOT NULL, + `template_id` INTEGER, `created_at` DATETIME, `updated_at` DATETIME, `version` INTEGER DEFAULT 0, @@ -2167,7 +2167,7 @@ CREATE TABLE `product_version` `ref` VARCHAR(255) NOT NULL, `visible` TINYINT DEFAULT 0 NOT NULL, `position` INTEGER NOT NULL, - `template_id` INTEGER NOT NULL, + `template_id` INTEGER, `created_at` DATETIME, `updated_at` DATETIME, `version` INTEGER DEFAULT 0 NOT NULL, diff --git a/local/config/schema.xml b/local/config/schema.xml index a43cfda56..86e313cdf 100755 --- a/local/config/schema.xml +++ b/local/config/schema.xml @@ -1,1199 +1,1199 @@ - - - - - - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - - - - - - - - - -
    - - - - - - - - - - -
    - - - - - - - - -
    - - - - - - - - - - - - - - - - - - - - - - - - -
    - - - - - - - - - - - - -
    - - - - - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - - - - - -
    - - - - - - - - - - - -
    - - - - - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    - - - - - - - - - - -
    - - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    - - - - - - - - - - - - -
    - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - - - - - - -
    - - - - - - - - - - - -
    - - - - - - - - - - - - -
    - - - - - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - - - - - - -
    - - - - - -
    - - - - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - - -
    - - - - - - - - - - - -
    - - - - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    - - - - - - - - - - - -
    - - - - - - - - -
    - - - - - - - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - - - - - - - - -
    - - - - - - - - - - - -
    - - - - - - - -
    -     + + + + + + + + + + + + + + + + + + + +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    + + + + + + + + + + + + + + + + + + + + +
    + + + + + + + + + + + + + + + + + + + + + +
    + + + + + + + + + + +
    + + + + + + + + +
    + + + + + + + + + + + + + + + + + + + + + + + + +
    + + + + + + + + + + + + +
    + + + + + + + + + + + + + + + + + + +
    + + + + + + + + + + + + + + + + + + + + + + + + + + +
    + + + + + + + + + + + + + + + + + +
    + + + + + + + + + + + +
    + + + + + + + + + + + + + + + + + + +
    + + + + + + + + + + + + + + + + + + + + + + + +
    + + + + + + + + + + + + + + + + + + +
    + + + + + + + + + + + + + + + + + +
    + + + + + + + + + + + + + + + + + +
    + + + + + + + + + + + + + + + + + + + + + + + + + +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    + + + + + + + + + + +
    + + + + + + + + + + + + + + + +
    + + + + + + + + + + + + + + + + + +
    + + + + + + + + + + + + + + + + +
    + + + + + + + + + + + + + + + + + + + +
    + + + + + + + + + + + + + + + + + + + +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    + + + + + + + + + + + + +
    + + + + + + + + + + + + + + +
    + + + + + + + + + + + + + + + + + + +
    + + + + + + + + + + + +
    + + + + + + + + + + + + +
    + + + + + + + + + + + + + + + + + + +
    + + + + + + + + + + + + + + + + + + +
    + + + + + +
    + + + + + + + + + + + + + + + + + +
    + + + + + + + + + + + + + + +
    + + + + + + + + + + + + + + +
    + + + + + + + + + + + +
    + + + + + + + + + + + + + + + + + +
    + + + + + + + + + + + + + + + + + + + +
    + + + + + + + + + + + + + + + + + + +
    + + + + + + + + + + + + + + + + + + + +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    + + + + + + + + + + + +
    + + + + + + + + +
    + + + + + + + + + + + + + + + + + + + + +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    + + + + + + + + + + + + + + + + + + +
    + + + + + + + + + + + + + + + + + + + +
    + + + + + + + + + + + + + + + + + + + +
    + + + + + + + + + + + + + + + + + + + +
    + + + + + + + + + + + + + + + + + + + +
    + + + + + + + + + + + + + + + + + + + +
    + + + + + + + + + + + + + + + + + + + +
    + + + + + + + + + + + + + + + + + + +
    + + + + + + + + + + + + + + + + + + +
    + + + + + + + + + + + + + + + + + + + + +
    + + + + + + + + + + + +
    + + + + + + + +
    +     From 0d1c6cf8cbeeb048626d86a95dbbe20bb7d7e1be Mon Sep 17 00:00:00 2001 From: Etienne Roudeix Date: Tue, 17 Sep 2013 19:47:10 +0200 Subject: [PATCH 57/74] postage + invoice step --- core/lib/Thelia/Action/Order.php | 3 +- core/lib/Thelia/Config/Resources/config.xml | 1 + .../Thelia/Config/Resources/routing/front.xml | 5 + .../Controller/Front/BaseFrontController.php | 10 ++ .../Controller/Front/OrderController.php | 76 ++++++++++- core/lib/Thelia/Core/Event/OrderEvent.php | 51 +++++-- .../lib/Thelia/Core/Template/Loop/Address.php | 22 ++- .../Core/Template/Loop/BaseSpecificModule.php | 3 +- .../lib/Thelia/Core/Template/Loop/Country.php | 2 +- .../Thelia/Core/Template/Loop/Delivery.php | 2 +- .../lib/Thelia/Core/Template/Loop/Payment.php | 84 ++++++++++++ .../Smarty/Plugins/DataAccessFunctions.php | 14 +- core/lib/Thelia/Form/OrderPayment.php | 94 +++++++++++++ core/lib/Thelia/Model/Order.php | 2 +- .../Thelia/Module/DeliveryModuleInterface.php | 2 +- local/modules/Colissimo/Colissimo.php | 2 +- templates/default/order_delivery.html | 2 +- templates/default/order_invoice.html | 128 +++++++++++++++--- 18 files changed, 455 insertions(+), 48 deletions(-) create mode 100644 core/lib/Thelia/Core/Template/Loop/Payment.php create mode 100755 core/lib/Thelia/Form/OrderPayment.php diff --git a/core/lib/Thelia/Action/Order.php b/core/lib/Thelia/Action/Order.php index a0d98265e..15266fac1 100755 --- a/core/lib/Thelia/Action/Order.php +++ b/core/lib/Thelia/Action/Order.php @@ -61,9 +61,8 @@ class Order extends BaseAction implements EventSubscriberInterface { $order = $event->getOrder(); - $deliveryAddress = $event->getDeliveryAddress(); - $order->setDeliveryModuleId($event->getDeliveryModule()); + $order->setPostage($event->getPostage()); $event->setOrder($order); } diff --git a/core/lib/Thelia/Config/Resources/config.xml b/core/lib/Thelia/Config/Resources/config.xml index 41e49d7d7..326f52145 100755 --- a/core/lib/Thelia/Config/Resources/config.xml +++ b/core/lib/Thelia/Config/Resources/config.xml @@ -64,6 +64,7 @@
    + diff --git a/core/lib/Thelia/Config/Resources/routing/front.xml b/core/lib/Thelia/Config/Resources/routing/front.xml index e702a1938..c1e153af0 100755 --- a/core/lib/Thelia/Config/Resources/routing/front.xml +++ b/core/lib/Thelia/Config/Resources/routing/front.xml @@ -122,6 +122,11 @@ order_delivery + + Thelia\Controller\Front\OrderController::pay + order_invoice + + Thelia\Controller\Front\DefaultController::noAction order_invoice diff --git a/core/lib/Thelia/Controller/Front/BaseFrontController.php b/core/lib/Thelia/Controller/Front/BaseFrontController.php index 69ea8553d..74e918b2d 100755 --- a/core/lib/Thelia/Controller/Front/BaseFrontController.php +++ b/core/lib/Thelia/Controller/Front/BaseFrontController.php @@ -65,4 +65,14 @@ class BaseFrontController extends BaseController $this->redirectToRoute("cart.view"); } } + + protected function checkValidDelivery() + { + $order = $this->getSession()->getOrder(); + if(null === $order || null === $order->chosenDeliveryAddress || null === $order->getDeliveryModuleId()) { + $this->redirectToRoute("order.delivery"); + } + + + } } diff --git a/core/lib/Thelia/Controller/Front/OrderController.php b/core/lib/Thelia/Controller/Front/OrderController.php index 393f71ebd..75fa91b36 100755 --- a/core/lib/Thelia/Controller/Front/OrderController.php +++ b/core/lib/Thelia/Controller/Front/OrderController.php @@ -28,9 +28,12 @@ use Thelia\Core\Event\OrderEvent; use Thelia\Core\Event\TheliaEvents; use Symfony\Component\HttpFoundation\Request; use Thelia\Form\OrderDelivery; +use Thelia\Form\OrderPayment; use Thelia\Log\Tlog; use Thelia\Model\AddressQuery; use Thelia\Model\AreaDeliveryModuleQuery; +use Thelia\Model\CountryQuery; +use Thelia\Model\ModuleQuery; use Thelia\Model\Order; /** @@ -41,7 +44,6 @@ use Thelia\Model\Order; class OrderController extends BaseFrontController { /** - * set billing address * set delivery address * set delivery module */ @@ -59,14 +61,16 @@ class OrderController extends BaseFrontController $deliveryAddressId = $form->get("delivery-address")->getData(); $deliveryModuleId = $form->get("delivery-module")->getData(); + $deliveryAddress = AddressQuery::create()->findPk($deliveryAddressId); + $deliveryModule = ModuleQuery::create()->findPk($deliveryModuleId); - /* check that the delivery address belong to the current customer */ + /* check that the delivery address belongs to the current customer */ $deliveryAddress = AddressQuery::create()->findPk($deliveryAddressId); if($deliveryAddress->getCustomerId() !== $this->getSecurityContext()->getCustomerUser()->getId()) { - throw new \Exception("Address does not belong to the current customer"); + throw new \Exception("Delivery address does not belong to the current customer"); } - /* check that the delivery module fetch the delivery address area */ + /* check that the delivery module fetches the delivery address area */ if(AreaDeliveryModuleQuery::create() ->filterByAreaId($deliveryAddress->getCountry()->getAreaId()) ->filterByDeliveryModuleId($deliveryModuleId) @@ -74,10 +78,18 @@ class OrderController extends BaseFrontController throw new \Exception("Delivery module cannot be use with selected delivery address"); } + /* try to get postage amount */ + $moduleReflection = new \ReflectionClass($deliveryModule->getFullNamespace()); + if ($moduleReflection->isSubclassOf("Thelia\Module\DeliveryModuleInterface") === false) { + throw new \RuntimeException(sprintf("delivery module %s is not a Thelia\Module\DeliveryModuleInterface", $deliveryModule->getCode())); + } + $moduleInstance = $moduleReflection->newInstance(); + $postage = $moduleInstance->getPostage($deliveryAddress->getCountry()); $orderEvent = $this->getOrderEvent(); $orderEvent->setDeliveryAddress($deliveryAddressId); $orderEvent->setDeliveryModule($deliveryModuleId); + $orderEvent->setPostage($postage); $this->getDispatcher()->dispatch(TheliaEvents::ORDER_SET_DELIVERY_ADDRESS, $orderEvent); $this->getDispatcher()->dispatch(TheliaEvents::ORDER_SET_DELIVERY_MODULE, $orderEvent); @@ -105,6 +117,62 @@ class OrderController extends BaseFrontController } + /** + * set invoice address + * set payment module + */ + public function pay() + { + $this->checkAuth(); + $this->checkCartNotEmpty(); + $this->checkValidDelivery(); + + $message = false; + + $orderPayment = new OrderPayment($this->getRequest()); + + try { + $form = $this->validateForm($orderPayment, "post"); + + $deliveryAddressId = $form->get("delivery-address")->getData(); + $deliveryModuleId = $form->get("delivery-module")->getData(); + + /* check that the invoice address belongs to the current customer */ + $deliveryAddress = AddressQuery::create()->findPk($deliveryAddressId); + if($deliveryAddress->getCustomerId() !== $this->getSecurityContext()->getCustomerUser()->getId()) { + throw new \Exception("Invoice address does not belong to the current customer"); + } + + $orderEvent = $this->getOrderEvent(); + $orderEvent->setInvoiceAddress($deliveryAddressId); + $orderEvent->setPaymentModule($deliveryModuleId); + + $this->getDispatcher()->dispatch(TheliaEvents::ORDER_SET_DELIVERY_ADDRESS, $orderEvent); + $this->getDispatcher()->dispatch(TheliaEvents::ORDER_SET_DELIVERY_MODULE, $orderEvent); + + $this->redirectToRoute("order.invoice"); + + } catch (FormValidationException $e) { + $message = sprintf("Please check your input: %s", $e->getMessage()); + } catch (PropelException $e) { + $this->getParserContext()->setGeneralError($e->getMessage()); + } catch (\Exception $e) { + $message = sprintf("Sorry, an error occured: %s", $e->getMessage()); + } + + if ($message !== false) { + Tlog::getInstance()->error(sprintf("Error during order delivery process : %s. Exception was %s", $message, $e->getMessage())); + + $orderPayment->setErrorMessage($message); + + $this->getParserContext() + ->addForm($orderPayment) + ->setGeneralError($message) + ; + } + + } + protected function getOrderEvent() { $order = $this->getOrder($this->getRequest()); diff --git a/core/lib/Thelia/Core/Event/OrderEvent.php b/core/lib/Thelia/Core/Event/OrderEvent.php index 6c2b5ff4b..349fd53a1 100755 --- a/core/lib/Thelia/Core/Event/OrderEvent.php +++ b/core/lib/Thelia/Core/Event/OrderEvent.php @@ -23,17 +23,16 @@ namespace Thelia\Core\Event; -use Thelia\Model\Address; -use Thelia\Model\AddressQuery; -use Thelia\Model\Module; use Thelia\Model\Order; class OrderEvent extends ActionEvent { protected $order = null; - protected $billingAddress = null; + protected $invoiceAddress = null; protected $deliveryAddress = null; protected $deliveryModule = null; + protected $paymentModule = null; + protected $postage = null; /** * @param Order $order @@ -54,7 +53,7 @@ class OrderEvent extends ActionEvent /** * @param $address */ - public function setBillingAddress($address) + public function setInvoiceAddress($address) { $this->deliveryAddress = $address; } @@ -75,6 +74,22 @@ class OrderEvent extends ActionEvent $this->deliveryModule = $module; } + /** + * @param $module + */ + public function setPaymentModule($module) + { + $this->paymentModule = $module; + } + + /** + * @param $postage + */ + public function setPostage($postage) + { + $this->postage = $postage; + } + /** * @return null|Order */ @@ -84,15 +99,15 @@ class OrderEvent extends ActionEvent } /** - * @return array|mixed|Address + * @return null|int */ - public function getBillingAddress() + public function getInvoiceAddress() { - return $this->billingAddress; + return $this->invoiceAddress; } /** - * @return array|mixed|Address + * @return null|int */ public function getDeliveryAddress() { @@ -100,10 +115,26 @@ class OrderEvent extends ActionEvent } /** - * @return array|mixed|Address + * @return null|int */ public function getDeliveryModule() { return $this->deliveryModule; } + + /** + * @return null|int + */ + public function getPaymentModule() + { + return $this->paymentModule; + } + + /** + * @return null|int + */ + public function getPostage() + { + return $this->postage; + } } diff --git a/core/lib/Thelia/Core/Template/Loop/Address.php b/core/lib/Thelia/Core/Template/Loop/Address.php index 1321592f4..9ca4352e9 100755 --- a/core/lib/Thelia/Core/Template/Loop/Address.php +++ b/core/lib/Thelia/Core/Template/Loop/Address.php @@ -54,7 +54,13 @@ class Address extends BaseLoop protected function getArgDefinitions() { return new ArgumentCollection( - Argument::createIntListTypeArgument('id'), + new Argument( + 'id', + new TypeCollection( + new Type\IntListType(), + new Type\EnumType(array('*', 'any')) + ) + ), new Argument( 'customer', new TypeCollection( @@ -63,8 +69,14 @@ class Address extends BaseLoop ), 'current' ), - Argument::createBooleanTypeArgument('default'), - Argument::createIntListTypeArgument('exclude') + Argument::createBooleanOrBothTypeArgument('default'), + new Argument( + 'exclude', + new TypeCollection( + new Type\IntListType(), + new Type\EnumType(array('none')) + ) + ) ); } @@ -79,7 +91,7 @@ class Address extends BaseLoop $id = $this->getId(); - if (null !== $id) { + if (null !== $id && !in_array($id, array('*', 'any'))) { $search->filterById($id, Criteria::IN); } @@ -106,7 +118,7 @@ class Address extends BaseLoop $exclude = $this->getExclude(); - if (!is_null($exclude)) { + if (null !== $exclude && 'none' !== $exclude) { $search->filterById($exclude, Criteria::NOT_IN); } diff --git a/core/lib/Thelia/Core/Template/Loop/BaseSpecificModule.php b/core/lib/Thelia/Core/Template/Loop/BaseSpecificModule.php index 2aaa173dc..6f5f23707 100644 --- a/core/lib/Thelia/Core/Template/Loop/BaseSpecificModule.php +++ b/core/lib/Thelia/Core/Template/Loop/BaseSpecificModule.php @@ -29,7 +29,6 @@ use Thelia\Core\Template\Loop\Argument\ArgumentCollection; use Thelia\Model\ModuleQuery; /** - * Class Delivery * @package Thelia\Core\Template\Loop * @author Manuel Raynaud */ @@ -93,6 +92,8 @@ class BaseSpecificModule extends BaseI18nLoop { $search = ModuleQuery::create(); + $search->filterByActivate(1); + if (null !== $id = $this->getId()) { $search->filterById($id); } diff --git a/core/lib/Thelia/Core/Template/Loop/Country.php b/core/lib/Thelia/Core/Template/Loop/Country.php index f14b97efc..3a05b684a 100755 --- a/core/lib/Thelia/Core/Template/Loop/Country.php +++ b/core/lib/Thelia/Core/Template/Loop/Country.php @@ -87,7 +87,7 @@ class Country extends BaseI18nLoop if (true === $withArea) { $search->filterByAreaId(null, Criteria::ISNOTNULL); - } elseif (false == $withArea) { + } elseif (false === $withArea) { $search->filterByAreaId(null, Criteria::ISNULL); } diff --git a/core/lib/Thelia/Core/Template/Loop/Delivery.php b/core/lib/Thelia/Core/Template/Loop/Delivery.php index dea302797..5d33d398d 100644 --- a/core/lib/Thelia/Core/Template/Loop/Delivery.php +++ b/core/lib/Thelia/Core/Template/Loop/Delivery.php @@ -89,7 +89,7 @@ class Delivery extends BaseSpecificModule ->set('CHAPO', $deliveryModule->getVirtualColumn('i18n_CHAPO')) ->set('DESCRIPTION', $deliveryModule->getVirtualColumn('i18n_DESCRIPTION')) ->set('POSTSCRIPTUM', $deliveryModule->getVirtualColumn('i18n_POSTSCRIPTUM')) - ->set('PRICE', $moduleInstance->calculate($country)) + ->set('POSTAGE', $moduleInstance->getPostage($country)) ; $loopResult->addRow($loopResultRow); diff --git a/core/lib/Thelia/Core/Template/Loop/Payment.php b/core/lib/Thelia/Core/Template/Loop/Payment.php new file mode 100644 index 000000000..542ffb590 --- /dev/null +++ b/core/lib/Thelia/Core/Template/Loop/Payment.php @@ -0,0 +1,84 @@ +. */ +/* */ +/*************************************************************************************/ + +namespace Thelia\Core\Template\Loop; +use Propel\Runtime\ActiveQuery\Criteria; +use Thelia\Core\Template\Element\LoopResult; +use Thelia\Core\Template\Element\LoopResultRow; +use Thelia\Core\Template\Loop\Argument\Argument; +use Thelia\Module\BaseModule; + +/** + * Class Payment + * @package Thelia\Core\Template\Loop + * @author Etienne Roudeix + */ +class Payment extends BaseSpecificModule +{ + + public function getArgDefinitions() + { + $collection = parent::getArgDefinitions(); + + return $collection; + } + + public function exec(&$pagination) + { + $search = parent::exec($pagination); + /* manage translations */ + $locale = $this->configureI18nProcessing($search); + + $search->filterByType(BaseModule::PAYMENT_MODULE_TYPE, Criteria::EQUAL); + + /* perform search */ + $paymentModules = $this->search($search, $pagination); + + $loopResult = new LoopResult($paymentModules); + + foreach ($paymentModules as $paymentModule) { + $loopResultRow = new LoopResultRow($loopResult, $paymentModule, $this->versionable, $this->timestampable, $this->countable); + + $moduleReflection = new \ReflectionClass($paymentModule->getFullNamespace()); + if ($moduleReflection->isSubclassOf("Thelia\Module\PaymentModuleInterface") === false) { + throw new \RuntimeException(sprintf("payment module %s is not a Thelia\Module\PaymentModuleInterface", $paymentModule->getCode())); + } + $moduleInstance = $moduleReflection->newInstance(); + + $moduleInstance->setRequest($this->request); + $moduleInstance->setDispatcher($this->dispatcher); + + $loopResultRow + ->set('ID', $paymentModule->getId()) + ->set('TITLE', $paymentModule->getVirtualColumn('i18n_TITLE')) + ->set('CHAPO', $paymentModule->getVirtualColumn('i18n_CHAPO')) + ->set('DESCRIPTION', $paymentModule->getVirtualColumn('i18n_DESCRIPTION')) + ->set('POSTSCRIPTUM', $paymentModule->getVirtualColumn('i18n_POSTSCRIPTUM')) + ; + + $loopResult->addRow($loopResultRow); + } + + return $loopResult; + } +} diff --git a/core/lib/Thelia/Core/Template/Smarty/Plugins/DataAccessFunctions.php b/core/lib/Thelia/Core/Template/Smarty/Plugins/DataAccessFunctions.php index 41341f789..ffad52785 100755 --- a/core/lib/Thelia/Core/Template/Smarty/Plugins/DataAccessFunctions.php +++ b/core/lib/Thelia/Core/Template/Smarty/Plugins/DataAccessFunctions.php @@ -188,7 +188,16 @@ class DataAccessFunctions extends AbstractSmartyPlugin public function orderDataAccess($params, &$smarty) { - return $this->dataAccess("Order", $params, $this->request->getSession()->getOrder()); + $order = $this->request->getSession()->getOrder(); + $attribute = $this->getNormalizedParam($params, array('attribute', 'attrib', 'attr')); + switch($attribute) { + case 'postage': + return $order->getPostage(); + case 'delivery_address': + return $order->chosenDeliveryAddress; + } + + throw new \InvalidArgumentException(sprintf("%s has no '%s' attribute", 'Order', $attribute)); } /** @@ -196,6 +205,8 @@ class DataAccessFunctions extends AbstractSmartyPlugin * * @param $params * @param $smarty + * + * @return string */ public function langDataAccess($params, $smarty) { @@ -294,6 +305,7 @@ class DataAccessFunctions extends AbstractSmartyPlugin */ public function getPluginDescriptors() { + return array( new SmartyPluginDescriptor('function', 'admin', $this, 'adminDataAccess'), new SmartyPluginDescriptor('function', 'customer', $this, 'customerDataAccess'), diff --git a/core/lib/Thelia/Form/OrderPayment.php b/core/lib/Thelia/Form/OrderPayment.php new file mode 100755 index 000000000..d3ebe4daf --- /dev/null +++ b/core/lib/Thelia/Form/OrderPayment.php @@ -0,0 +1,94 @@ +. */ +/* */ +/*************************************************************************************/ +namespace Thelia\Form; + +use Symfony\Component\Validator\Constraints; +use Symfony\Component\Validator\ExecutionContextInterface; +use Thelia\Model\AddressQuery; +use Thelia\Model\ConfigQuery; +use Thelia\Core\Translation\Translator; +use Thelia\Model\ModuleQuery; +use Thelia\Module\BaseModule; + +/** + * Class OrderPayment + * @package Thelia\Form + * @author Etienne Roudeix + */ +class OrderPayment extends BaseForm +{ + protected function buildForm() + { + $this->formBuilder + ->add("invoice-address", "integer", array( + "required" => true, + "constraints" => array( + new Constraints\NotBlank(), + new Constraints\Callback(array( + "methods" => array( + array($this, "verifyInvoiceAddress") + ) + )) + ) + )) + ->add("payment-module", "integer", array( + "required" => true, + "constraints" => array( + new Constraints\NotBlank(), + new Constraints\Callback(array( + "methods" => array( + array($this, "verifyPaymentModule") + ) + )) + ) + )); + } + + public function verifyInvoiceAddress($value, ExecutionContextInterface $context) + { + $address = AddressQuery::create() + ->findPk($value); + + if(null === $address) { + $context->addViolation("Address ID not found"); + } + } + + public function verifyPaymentModule($value, ExecutionContextInterface $context) + { + $module = ModuleQuery::create() + ->filterByType(BaseModule::PAYMENT_MODULE_TYPE) + ->filterByActivate(1) + ->filterById($value) + ->find(); + + if(null === $module) { + $context->addViolation("Payment module ID not found"); + } + } + + public function getName() + { + return "thelia_order_payment"; + } +} \ No newline at end of file diff --git a/core/lib/Thelia/Model/Order.php b/core/lib/Thelia/Model/Order.php index 2bc014d27..e2eb43971 100755 --- a/core/lib/Thelia/Model/Order.php +++ b/core/lib/Thelia/Model/Order.php @@ -7,7 +7,7 @@ use Thelia\Model\Base\Order as BaseOrder; class Order extends BaseOrder { public $chosenDeliveryAddress = null; - public $chosenInvoiceModule = null; + public $chosenInvoiceAddress = null; /** * calculate the total amount diff --git a/core/lib/Thelia/Module/DeliveryModuleInterface.php b/core/lib/Thelia/Module/DeliveryModuleInterface.php index 72f8769bc..17b000d4f 100644 --- a/core/lib/Thelia/Module/DeliveryModuleInterface.php +++ b/core/lib/Thelia/Module/DeliveryModuleInterface.php @@ -34,5 +34,5 @@ interface DeliveryModuleInterface extends BaseModuleInterface * * @return mixed */ - public function calculate(Country $country); + public function getPostage(Country $country); } diff --git a/local/modules/Colissimo/Colissimo.php b/local/modules/Colissimo/Colissimo.php index 2fe9cd0b9..14ad36b0d 100755 --- a/local/modules/Colissimo/Colissimo.php +++ b/local/modules/Colissimo/Colissimo.php @@ -61,7 +61,7 @@ class Colissimo extends BaseModule implements DeliveryModuleInterface * @param Country $country * @return mixed */ - public function calculate(Country $country) + public function getPostage(Country $country) { // TODO: Implement calculate() method. return 2; diff --git a/templates/default/order_delivery.html b/templates/default/order_delivery.html index d72cfedf2..46a5be64e 100644 --- a/templates/default/order_delivery.html +++ b/templates/default/order_delivery.html @@ -128,7 +128,7 @@ {form_field form=$form field='delivery-module'} {/form_field} - {$TITLE} / {currency attr="symbol"} {$PRICE} + {$TITLE} / {currency attr="symbol"} {$POSTAGE}
    {/loop} diff --git a/templates/default/order_invoice.html b/templates/default/order_invoice.html index 2b76454e9..033c46838 100644 --- a/templates/default/order_invoice.html +++ b/templates/default/order_invoice.html @@ -25,12 +25,19 @@
    1 Your Cart - 2 Billing and delivery + 2 Billing and delivery 3 Check my order 4 Secure payment
    - + {form name="thelia.order.payment"} + + + + {form_hidden_fields form=$form} + + {if $form_error}
    {$form_error_message}
    {/if} + @@ -123,7 +130,7 @@ @@ -151,32 +158,105 @@
    + {loop type="address" name="delivery-address" id="{order attr="delivery_address"}"}
    Delivery address
    - M. DUPONT Jean - Agency XY + {loop type="title" name="customer.title.info" id=$TITLE}{$SHORT}{/loop} {$LASTNAME|upper} {$FIRSTNAME|ucwords} + {$COMPANY}
    - street name of my business
    - 75000 - City, Country + {$ADDRESS1}
    + {if $ADDRESS2 != ""} + {$ADDRESS2}
    + {/if} + {if $ADDRESS3 != ""} + {$ADDRESS3}
    + {/if} + {$ZIPCODE} + {$CITY}, {loop type="country" name="customer.country.info" id=$COUNTRY}{$TITLE}{/loop}
    + {/loop}
    + + {form_field form=$form field='invoice-address'} +
    Billing address
    + + {if $error} + {$message} + {/if} +
    - M. DUPONT Jean - Agency XY -
    - street name of my business
    - 75000 - City, Country -
    - Change address + +
    Shipping Tax
    - {order attr="postage"} + {currency attr="symbol"} {order attr="postage"}
    + + {loop type="address" name="invoice-address" default="{if !$error && $value}*{else}true{/if}" id="{if !$error && $value}{$value}{else}*{/if}"} + + + + + + + {if !$error} + + + + {/if} + + {/loop} + + {loop type="address" name="invoice-address" default="{if !$error && $value}*{else}false{/if}" exclude="{if !$error && $value}{$value}{else}none{/if}"} + + + + + + + {/loop} + +
    + {loop type="title" name="customer.title.info" id=$TITLE}{$SHORT}{/loop} {$LASTNAME|upper} {$FIRSTNAME|ucwords} + {$COMPANY} +
    + {$ADDRESS1}
    + {if $ADDRESS2 != ""} + {$ADDRESS2}
    + {/if} + {if $ADDRESS3 != ""} + {$ADDRESS3}
    + {/if} + {$ZIPCODE} + {$CITY}, {loop type="country" name="customer.country.info" id=$COUNTRY}{$TITLE}{/loop} +
    +     		+ +
    + Change address +
    + {loop type="title" name="customer.title.info" id=$TITLE}{$SHORT}{/loop} {$LASTNAME|upper} {$FIRSTNAME|ucwords} + {$COMPANY} +
    + {$ADDRESS1}
    + {if $ADDRESS2 != ""} + {$ADDRESS2}
    + {/if} + {if $ADDRESS3 != ""} + {$ADDRESS3}
    + {/if} + {$ZIPCODE} + {$CITY}, {loop type="country" name="customer.country.info" id=$COUNTRY}{$TITLE}{/loop} +
    +     		+ +
    +
    +
    + {/form_field}
    Choose your payment method
    @@ -195,10 +275,12 @@
    - Back - + Back + + {/form} + @@ -209,8 +291,16 @@ {block name="javascript-initialization"} {/block} \ No newline at end of file From 347e5e5089f7305b7dae2eab222795cfca40e557 Mon Sep 17 00:00:00 2001 From: Etienne Roudeix Date: Tue, 17 Sep 2013 19:52:20 +0200 Subject: [PATCH 58/74] fix postage display --- templates/default/order_invoice.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/default/order_invoice.html b/templates/default/order_invoice.html index 033c46838..865fdb267 100644 --- a/templates/default/order_invoice.html +++ b/templates/default/order_invoice.html @@ -149,7 +149,7 @@ Total TTC
    - {currency attr="symbol"} {cart attr="total_taxed_price"} + {currency attr="symbol"} {{cart attr="total_taxed_price"} + {order attr="postage"}}
    From 03375a65b3cd7d385d6435e8d773cac41accc33a Mon Sep 17 00:00:00 2001 From: Etienne Roudeix Date: Tue, 17 Sep 2013 20:07:50 +0200 Subject: [PATCH 59/74] payment loop --- core/lib/Thelia/Config/Resources/config.xml | 1 + templates/default/order_invoice.html | 12 ++++++++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/core/lib/Thelia/Config/Resources/config.xml b/core/lib/Thelia/Config/Resources/config.xml index 326f52145..c0199652d 100755 --- a/core/lib/Thelia/Config/Resources/config.xml +++ b/core/lib/Thelia/Config/Resources/config.xml @@ -24,6 +24,7 @@ + diff --git a/templates/default/order_invoice.html b/templates/default/order_invoice.html index 865fdb267..b08283c6c 100644 --- a/templates/default/order_invoice.html +++ b/templates/default/order_invoice.html @@ -258,11 +258,15 @@ {/form_field} + {form_field form=$form field='payment-module'} +
    Choose your payment method
      - $value) { ?> + + {loop type="payment" name="payments" force_return="true"} +
      • - + + {/loop} +
    + {/form_field} + Back From da7f9e07c407f3d70f2aea053270bebbddb1ea80 Mon Sep 17 00:00:00 2001 From: Manuel Raynaud Date: Tue, 17 Sep 2013 20:15:28 +0200 Subject: [PATCH 60/74] create test for UrlRewritingTrait --- core/lib/Thelia/Model/RewritingUrl.php | 12 +-- .../Thelia/Model/Tools/UrlRewritingTrait.php | 9 +- .../Tests/Rewriting/ProductRewriteTest.php | 88 +++++++++++++++++++ 3 files changed, 96 insertions(+), 13 deletions(-) create mode 100644 core/lib/Thelia/Tests/Rewriting/ProductRewriteTest.php diff --git a/core/lib/Thelia/Model/RewritingUrl.php b/core/lib/Thelia/Model/RewritingUrl.php index 9dd826d01..a13777c41 100644 --- a/core/lib/Thelia/Model/RewritingUrl.php +++ b/core/lib/Thelia/Model/RewritingUrl.php @@ -2,25 +2,25 @@ namespace Thelia\Model; +use Propel\Runtime\ActiveQuery\Criteria; use Propel\Runtime\Connection\ConnectionInterface; use Thelia\Model\Base\RewritingUrl as BaseRewritingUrl; use Thelia\Model\RewritingUrlQuery; class RewritingUrl extends BaseRewritingUrl { - public function preSave(ConnectionInterface $con = null) + public function postInsert(ConnectionInterface $con = null) { - if($this->getRedirected() == 0) { - //check if rewriting url alredy exists and put redirect to 1 + if(null !== $this->getRedirected()) { + //check if rewriting url alredy exists and put redirect to the new one RewritingUrlQuery::create() ->filterByView($this->getView()) ->filterByViewId($this->getViewId()) ->filterByViewLocale($this->getViewLocale()) + ->filterByRedirected($this->getId(), Criteria::NOT_IN) ->update(array( - "redirect" => 1 + "Redirected" => $this->getId() )); } - - return true; } } diff --git a/core/lib/Thelia/Model/Tools/UrlRewritingTrait.php b/core/lib/Thelia/Model/Tools/UrlRewritingTrait.php index c9154a0db..1b9087626 100644 --- a/core/lib/Thelia/Model/Tools/UrlRewritingTrait.php +++ b/core/lib/Thelia/Model/Tools/UrlRewritingTrait.php @@ -55,17 +55,13 @@ trait UrlRewritingTrait { public function generateRewrittenUrl($locale) { if ($this->isNew()) { - throw new \RuntimeException(sprintf('Object %s must be save before generating url', $this->getRewrittenUrlViewName())); + throw new \RuntimeException(sprintf('Object %s must be saved before generating url', $this->getRewrittenUrlViewName())); } // Borrowed from http://stackoverflow.com/questions/2668854/sanitizing-strings-to-make-them-url-and-filename-safe $this->setLocale($locale); - $title = $this->getTitle(); - - if (null === $title) { - throw new \RuntimeException(sprintf('Impossible to generate url if title does not exists for the locale %s', $locale)); - } + $title = $this->getTitle() ?: $this->getRef(); // Replace all weird characters with dashes $string = preg_replace('/[^\w\-~_\.]+/u', '-', $title); @@ -88,7 +84,6 @@ trait UrlRewritingTrait { ->setView($this->getRewrittenUrlViewName()) ->setViewId($this->getId()) ->setViewLocale($locale) - ->setRedirected(0) ->save() ; } diff --git a/core/lib/Thelia/Tests/Rewriting/ProductRewriteTest.php b/core/lib/Thelia/Tests/Rewriting/ProductRewriteTest.php new file mode 100644 index 000000000..c38773814 --- /dev/null +++ b/core/lib/Thelia/Tests/Rewriting/ProductRewriteTest.php @@ -0,0 +1,88 @@ +. */ +/* */ +/*************************************************************************************/ + +namespace Thelia\Tests\Rewriting; +use Thelia\Model\Product; +use Thelia\Model\ProductQuery; + + +/** + * Class ProductRewriteTest + * @package Thelia\Tests\Rewriting + * @author Manuel Raynaud + */ +class ProductRewriteTest extends \PHPUnit_Framework_TestCase +{ + protected static $productId; + + public static function setUpBeforeClass() + { + $product = new Product(); + $product->setRef(sprintf("TestRewrittenProduct%s",uniqid())) + ->setPosition(1) + ->setVisible(1) + ->setLocale('en_US') + ->setTitle('My english super Title') + ->setLocale('fr_FR') + ->setTitle('Mon super titre en français') + ->save(); + + self::$productId = $product->getId(); + } + + /** + * @covers Thelia\Model\Tools\UrlRewritingTrait::generateRewrittenUrl + */ + public function testFrenchRewrittenUrl() + { + $product = ProductQuery::create()->findPk(self::$productId); + + $rewrittenUrl = $product->generateRewrittenUrl('fr_FR'); + $this->assertNotNull($rewrittenUrl, "rewritten url can not be null"); + $this->assertRegExp('/^mon-super-titre-en-français(-[0-9]+)?\.html$/', $rewrittenUrl); + //mon-super-titre-en-français-2.html + } + + /** + * @covers Thelia\Model\Tools\UrlRewritingTrait::generateRewrittenUrl + */ + public function testEnglishRewrittenUrl() + { + $product = ProductQuery::create()->findPk(self::$productId); + + $rewrittenUrl = $product->generateRewrittenUrl('en_US'); + $this->assertNotNull($rewrittenUrl, "rewritten url can not be null"); + $this->assertRegExp('/^my-english-super-title(-[0-9]+)?\.html$/', $rewrittenUrl); + } + + /** + * @expectedException \RuntimeException + * @expectedExceptionMessage Object product must be saved before generating url + */ + public function testOnNotSavedProduct() + { + $product = new Product(); + + $product->generateRewrittenUrl('fr_FR'); + } +} \ No newline at end of file From f068539e79ef1fd42213579fa52aa27782b171b0 Mon Sep 17 00:00:00 2001 From: Manuel Raynaud Date: Tue, 17 Sep 2013 20:16:51 +0200 Subject: [PATCH 61/74] add covers annotation in ProductRewriteTest --- core/lib/Thelia/Tests/Rewriting/ProductRewriteTest.php | 1 + 1 file changed, 1 insertion(+) diff --git a/core/lib/Thelia/Tests/Rewriting/ProductRewriteTest.php b/core/lib/Thelia/Tests/Rewriting/ProductRewriteTest.php index c38773814..b6601289d 100644 --- a/core/lib/Thelia/Tests/Rewriting/ProductRewriteTest.php +++ b/core/lib/Thelia/Tests/Rewriting/ProductRewriteTest.php @@ -76,6 +76,7 @@ class ProductRewriteTest extends \PHPUnit_Framework_TestCase } /** + * @covers Thelia\Model\Tools\UrlRewritingTrait::generateRewrittenUrl * @expectedException \RuntimeException * @expectedExceptionMessage Object product must be saved before generating url */ From 1e15142283019420d75c4aa622bddfa766f23170 Mon Sep 17 00:00:00 2001 From: franck Date: Tue, 17 Sep 2013 20:18:53 +0200 Subject: [PATCH 62/74] Added product creation --- core/lib/Thelia/Model/Product.php | 48 +++++++++++++++++++++++++++++-- 1 file changed, 45 insertions(+), 3 deletions(-) diff --git a/core/lib/Thelia/Model/Product.php b/core/lib/Thelia/Model/Product.php index 541668ddb..ef000e820 100755 --- a/core/lib/Thelia/Model/Product.php +++ b/core/lib/Thelia/Model/Product.php @@ -10,6 +10,8 @@ use Propel\Runtime\Connection\ConnectionInterface; use Thelia\Core\Event\TheliaEvents; use Thelia\Core\Event\ProductEvent; use Propel\Runtime\ActiveQuery\Criteria; +use Propel\Runtime\Propel; +use Thelia\Model\Map\ProductTableMap; class Product extends BaseProduct { @@ -19,6 +21,8 @@ class Product extends BaseProduct use \Thelia\Model\Tools\UrlRewritingTrait; + protected $defaultCategory = null; + /** * {@inheritDoc} */ @@ -45,7 +49,7 @@ class Product extends BaseProduct } /** - * @return the current default category for this product + * @return the current default category ID for this product */ public function getDefaultCategoryId() { @@ -84,6 +88,42 @@ class Product extends BaseProduct return $this; } + /** + * Create a new product, along with the default category ID + * + * @param int $defaultCategoryId the default category ID of this product + */ + public function create($defaultCategoryId) { + + $con = Propel::getWriteConnection(ProductTableMap::DATABASE_NAME); + + $con->beginTransaction(); + + try { + // Create the product + $this->save($con); + + // Add the default category + $pc = new ProductCategory(); + + $pc + ->setProduct($this) + ->setCategoryId($defaultCategoryId) + ->setDefaultCategory(true) + ->save($con) + ; + + // Store all the stuff ! + $con->commit(); + } + catch(PropelException $ex) { + + $con->rollback(); + + throw $ex; + } + } + /** * Calculate next position relative to our default category */ @@ -105,8 +145,6 @@ class Product extends BaseProduct */ public function preInsert(ConnectionInterface $con = null) { - $this->setPosition($this->getNextPosition()); - $this->generateRewritenUrl($this->getLocale()); $this->dispatchEvent(TheliaEvents::BEFORE_CREATEPRODUCT, new ProductEvent($this)); @@ -119,6 +157,10 @@ class Product extends BaseProduct */ public function postInsert(ConnectionInterface $con = null) { + $this->setPosition($this->getNextPosition()); + + $this->save(); + $this->dispatchEvent(TheliaEvents::AFTER_CREATEPRODUCT, new ProductEvent($this)); } From e4b36098c75b6e2a70f9a7836a7707692a07f04b Mon Sep 17 00:00:00 2001 From: Manuel Raynaud Date: Tue, 17 Sep 2013 20:29:09 +0200 Subject: [PATCH 63/74] fix typo and remove url generation in postInsert model --- core/lib/Thelia/Controller/Admin/CategoryController.php | 2 +- core/lib/Thelia/Controller/Admin/ProductController.php | 2 +- core/lib/Thelia/Model/Category.php | 1 - core/lib/Thelia/Model/Content.php | 5 ----- core/lib/Thelia/Model/Folder.php | 5 ----- core/lib/Thelia/Model/FolderI18n.php | 6 ++++++ core/lib/Thelia/Model/Product.php | 1 - core/lib/Thelia/Model/ProductI18n.php | 6 ++++++ 8 files changed, 14 insertions(+), 14 deletions(-) diff --git a/core/lib/Thelia/Controller/Admin/CategoryController.php b/core/lib/Thelia/Controller/Admin/CategoryController.php index 8c74c31ec..4d0d15ef1 100755 --- a/core/lib/Thelia/Controller/Admin/CategoryController.php +++ b/core/lib/Thelia/Controller/Admin/CategoryController.php @@ -133,7 +133,7 @@ class CategoryController extends AbstractCrudController 'description' => $object->getDescription(), 'postscriptum' => $object->getPostscriptum(), 'visible' => $object->getVisible(), - 'url' => $object->getRewritenUrl($this->getCurrentEditionLocale()), + 'url' => $object->getRewrittenUrl($this->getCurrentEditionLocale()), 'parent' => $object->getParent() ); diff --git a/core/lib/Thelia/Controller/Admin/ProductController.php b/core/lib/Thelia/Controller/Admin/ProductController.php index e1b651e60..b167922e0 100644 --- a/core/lib/Thelia/Controller/Admin/ProductController.php +++ b/core/lib/Thelia/Controller/Admin/ProductController.php @@ -141,7 +141,7 @@ class ProductController extends AbstractCrudController 'description' => $object->getDescription(), 'postscriptum' => $object->getPostscriptum(), 'visible' => $object->getVisible(), - 'url' => $object->getRewritenUrl($this->getCurrentEditionLocale()), + 'url' => $object->getRewrittenUrl($this->getCurrentEditionLocale()), 'parent' => $object->getParent() ); diff --git a/core/lib/Thelia/Model/Category.php b/core/lib/Thelia/Model/Category.php index 204896674..347a0f7f7 100755 --- a/core/lib/Thelia/Model/Category.php +++ b/core/lib/Thelia/Model/Category.php @@ -79,7 +79,6 @@ class Category extends BaseCategory */ public function postInsert(ConnectionInterface $con = null) { - //$this->generateRewrittenUrl($this->getLocale()); $this->dispatchEvent(TheliaEvents::AFTER_CREATECATEGORY, new CategoryEvent($this)); } diff --git a/core/lib/Thelia/Model/Content.php b/core/lib/Thelia/Model/Content.php index 4d9cf9f3a..10ed2afe3 100755 --- a/core/lib/Thelia/Model/Content.php +++ b/core/lib/Thelia/Model/Content.php @@ -39,9 +39,4 @@ class Content extends BaseContent return true; } - - public function postInsert(ConnectionInterface $con = null) - { - //$this->generateRewrittenUrl($this->getLocale()); - } } diff --git a/core/lib/Thelia/Model/Folder.php b/core/lib/Thelia/Model/Folder.php index e32505d9d..f9006fbd7 100755 --- a/core/lib/Thelia/Model/Folder.php +++ b/core/lib/Thelia/Model/Folder.php @@ -70,9 +70,4 @@ class Folder extends BaseFolder return true; } - - public function postInsert(ConnectionInterface $con = null) - { - //$this->generateRewrittenUrl($this->getLocale()); - } } diff --git a/core/lib/Thelia/Model/FolderI18n.php b/core/lib/Thelia/Model/FolderI18n.php index d1044452b..7ede39502 100755 --- a/core/lib/Thelia/Model/FolderI18n.php +++ b/core/lib/Thelia/Model/FolderI18n.php @@ -2,8 +2,14 @@ namespace Thelia\Model; +use Propel\Runtime\Connection\ConnectionInterface; use Thelia\Model\Base\FolderI18n as BaseFolderI18n; class FolderI18n extends BaseFolderI18n { + public function postInsert(ConnectionInterface $con = null) + { + $folder = $this->getFolder(); + $folder->generateRewrittenUrl($this->getLocale()); + } } diff --git a/core/lib/Thelia/Model/Product.php b/core/lib/Thelia/Model/Product.php index be534298e..fbac7c71a 100755 --- a/core/lib/Thelia/Model/Product.php +++ b/core/lib/Thelia/Model/Product.php @@ -119,7 +119,6 @@ class Product extends BaseProduct */ public function postInsert(ConnectionInterface $con = null) { - //$this->generateRewrittenUrl($this->getLocale()); $this->dispatchEvent(TheliaEvents::AFTER_CREATEPRODUCT, new ProductEvent($this)); } diff --git a/core/lib/Thelia/Model/ProductI18n.php b/core/lib/Thelia/Model/ProductI18n.php index 7507bceb1..6ec3ac4a3 100755 --- a/core/lib/Thelia/Model/ProductI18n.php +++ b/core/lib/Thelia/Model/ProductI18n.php @@ -2,8 +2,14 @@ namespace Thelia\Model; +use Propel\Runtime\Connection\ConnectionInterface; use Thelia\Model\Base\ProductI18n as BaseProductI18n; class ProductI18n extends BaseProductI18n { + public function postInsert(ConnectionInterface $con = null) + { + $product = $this->getProduct(); + $product->generateRewrittenUrl($this->getLocale()); + } } From 294c48f8abd5e48090a4dc32fa18eb7679f70904 Mon Sep 17 00:00:00 2001 From: Etienne Roudeix Date: Tue, 17 Sep 2013 20:32:51 +0200 Subject: [PATCH 64/74] fix content faker --- install/faker.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/install/faker.php b/install/faker.php index 3d48fc0e1..eed6db11a 100755 --- a/install/faker.php +++ b/install/faker.php @@ -281,7 +281,7 @@ try { $folder = new Thelia\Model\Folder(); $folder->setParent(0); $folder->setVisible(1); - $folder->setPosition($i); + $folder->setPosition($i+1); setI18n($faker, $folder); $folder->save(); @@ -294,11 +294,11 @@ try { $document->setFolderId($folder->getId()); generate_document($document, 1, 'folder', $folder->getId()); - for($j=1; $jsetParent($folder->getId()); $subfolder->setVisible(1); - $subfolder->setPosition($j); + $subfolder->setPosition($j+1); setI18n($faker, $subfolder); $subfolder->save(); @@ -311,7 +311,7 @@ try { $document->setFolderId($folder->getId()); generate_document($document, 1, 'folder', $subfolder->getId()); - for($k=0; $kaddFolder($subfolder); @@ -320,8 +320,8 @@ try { $collection->prepend($contentFolders[0]->setDefaultFolder(1)); $content->setContentFolders($collection); - $content->setVisible(rand(1, 10)>7 ? 0 : 1); - $content->setPosition($k); + $content->setVisible(1); + $content->setPosition($k+1); setI18n($faker, $content); $content->save(); From 5a64654ce53f40ba52f2da99f2113427a43d03f5 Mon Sep 17 00:00:00 2001 From: Manuel Raynaud Date: Tue, 17 Sep 2013 20:45:29 +0200 Subject: [PATCH 65/74] move url generation to I18n entity --- core/lib/Thelia/Model/CategoryI18n.php | 7 ++++++- core/lib/Thelia/Model/ContentI18n.php | 7 ++++++- core/lib/Thelia/Model/Folder.php | 1 - 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/core/lib/Thelia/Model/CategoryI18n.php b/core/lib/Thelia/Model/CategoryI18n.php index bb4e7b3f3..de3e38663 100755 --- a/core/lib/Thelia/Model/CategoryI18n.php +++ b/core/lib/Thelia/Model/CategoryI18n.php @@ -2,8 +2,13 @@ namespace Thelia\Model; +use Propel\Runtime\Connection\ConnectionInterface; use Thelia\Model\Base\CategoryI18n as BaseCategoryI18n; class CategoryI18n extends BaseCategoryI18n { - + public function postInsert(ConnectionInterface $con = null) + { + $category = $this->getCategory(); + $category->generateRewrittenUrl($this->getLocale()); + } } diff --git a/core/lib/Thelia/Model/ContentI18n.php b/core/lib/Thelia/Model/ContentI18n.php index 5b29d894f..11713d57b 100755 --- a/core/lib/Thelia/Model/ContentI18n.php +++ b/core/lib/Thelia/Model/ContentI18n.php @@ -2,8 +2,13 @@ namespace Thelia\Model; +use Propel\Runtime\Connection\ConnectionInterface; use Thelia\Model\Base\ContentI18n as BaseContentI18n; class ContentI18n extends BaseContentI18n { - + public function postInsert(ConnectionInterface $con = null) + { + $content = $this->getContent(); + $content->generateRewrittenUrl($this->getLocale()); + } } diff --git a/core/lib/Thelia/Model/Folder.php b/core/lib/Thelia/Model/Folder.php index f9006fbd7..8cbe00ce0 100755 --- a/core/lib/Thelia/Model/Folder.php +++ b/core/lib/Thelia/Model/Folder.php @@ -67,7 +67,6 @@ class Folder extends BaseFolder { $this->setPosition($this->getNextPosition()); - return true; } } From 48e2be57c6ade1fdc743ee38e8536e20c387f923 Mon Sep 17 00:00:00 2001 From: franck Date: Wed, 18 Sep 2013 01:24:37 +0200 Subject: [PATCH 66/74] Fixed some unit tests --- core/lib/Thelia/Core/Template/Loop/Image.php | 9 ++- .../lib/Thelia/Core/Template/Loop/TaxRule.php | 9 ++- .../Core/Template/Element/BaseLoopTestor.php | 5 +- .../Tests/Core/Template/Loop/DocumentTest.php | 13 ++-- .../Tests/Core/Template/Loop/ImageTest.php | 13 ++-- .../Tests/Core/Template/Loop/ProductTest.php | 3 +- .../Tests/Core/Template/Loop/TaxRuleTest.php | 60 +++++++++++++++++++ .../Thelia/Tests/TaxEngine/CalculatorTest.php | 2 +- 8 files changed, 84 insertions(+), 30 deletions(-) create mode 100644 core/lib/Thelia/Tests/Core/Template/Loop/TaxRuleTest.php diff --git a/core/lib/Thelia/Core/Template/Loop/Image.php b/core/lib/Thelia/Core/Template/Loop/Image.php index c85d41fc7..8d0c99400 100755 --- a/core/lib/Thelia/Core/Template/Loop/Image.php +++ b/core/lib/Thelia/Core/Template/Loop/Image.php @@ -175,7 +175,7 @@ class Image extends BaseI18nLoop $source_id = $this->getSourceId(); $id = $this->getId(); - //echo "source = ".$this->getSource()."source_id=$source_id, id=$id
    "; + //echo "source = ".$this->getSourceId()."source_id=$source_id, id=$id
    "; if (is_null($source_id) && is_null($id)) { throw new \InvalidArgumentException("If 'source' argument is specified, 'id' or 'source_id' argument should be specified"); @@ -214,6 +214,7 @@ class Image extends BaseI18nLoop */ public function exec(&$pagination) { + // Select the proper query to use, and get the object type $object_type = $object_id = null; @@ -262,13 +263,14 @@ class Image extends BaseI18nLoop } - //echo "sql=".$search->toString(); + // echo "sql=".$search->toString(); $results = $this->search($search, $pagination); $loopResult = new LoopResult($results); foreach ($results as $result) { + // Create image processing event $event = new ImageEvent($this->request); @@ -315,7 +317,8 @@ class Image extends BaseI18nLoop ; $loopResult->addRow($loopResultRow); - } catch (\Exception $ex) { + } + catch (\Exception $ex) { // Ignore the result and log an error Tlog::getInstance()->addError("Failed to process image in image loop: ", $this->args); } diff --git a/core/lib/Thelia/Core/Template/Loop/TaxRule.php b/core/lib/Thelia/Core/Template/Loop/TaxRule.php index a8ba3bf4a..5851f631d 100644 --- a/core/lib/Thelia/Core/Template/Loop/TaxRule.php +++ b/core/lib/Thelia/Core/Template/Loop/TaxRule.php @@ -31,11 +31,9 @@ use Thelia\Core\Template\Element\LoopResultRow; use Thelia\Core\Template\Loop\Argument\ArgumentCollection; use Thelia\Core\Template\Loop\Argument\Argument; -use Thelia\Model\Base\CategoryQuery; -use Thelia\Model\Base\ProductCategoryQuery; -use Thelia\Model\Base\TaxRuleQuery; use Thelia\Type\TypeCollection; use Thelia\Type; +use Thelia\Model\TaxRuleQuery; /** * @@ -57,7 +55,8 @@ class TaxRule extends BaseI18nLoop { return new ArgumentCollection( Argument::createIntListTypeArgument('id'), - new Argument( + Argument::createIntListTypeArgument('exclude'), + new Argument( 'order', new TypeCollection( new Type\EnumListType(array('id', 'id_reverse', 'alpha', 'alpha_reverse')) @@ -77,7 +76,7 @@ class TaxRule extends BaseI18nLoop $search = TaxRuleQuery::create(); /* manage translations */ - $locale = $this->configureI18nProcessing($search, 'TITLE', 'DESCRIPTION'); + $locale = $this->configureI18nProcessing($search, array('TITLE', 'DESCRIPTION')); $id = $this->getId(); diff --git a/core/lib/Thelia/Tests/Core/Template/Element/BaseLoopTestor.php b/core/lib/Thelia/Tests/Core/Template/Element/BaseLoopTestor.php index 2b31d265a..eb271d4c1 100755 --- a/core/lib/Thelia/Tests/Core/Template/Element/BaseLoopTestor.php +++ b/core/lib/Thelia/Tests/Core/Template/Element/BaseLoopTestor.php @@ -132,7 +132,7 @@ abstract class BaseLoopTestor extends \PHPUnit_Framework_TestCase $this->assertInstanceOf('\Thelia\Core\Template\Element\LoopResult', $methodReturn); } - public function baseTestSearchById($id) + public function baseTestSearchById($id, $other_args = array()) { $this->instance->initializeArgs(array_merge( $this->getMandatoryArguments(), @@ -140,7 +140,8 @@ abstract class BaseLoopTestor extends \PHPUnit_Framework_TestCase "type" => "foo", "name" => "foo", "id" => $id, - ) + ), + $other_args )); $dummy = null; diff --git a/core/lib/Thelia/Tests/Core/Template/Loop/DocumentTest.php b/core/lib/Thelia/Tests/Core/Template/Loop/DocumentTest.php index 04e41b6f8..2b7019879 100644 --- a/core/lib/Thelia/Tests/Core/Template/Loop/DocumentTest.php +++ b/core/lib/Thelia/Tests/Core/Template/Loop/DocumentTest.php @@ -58,32 +58,27 @@ class DocumentTest extends BaseLoopTestor { $document = ProductDocumentQuery::create()->findOne(); - $this->baseTestSearchById($document->getId()); + $this->baseTestSearchById($document->getId(), array('source' => 'product')); } public function testSearchByFolderId() { $document = FolderDocumentQuery::create()->findOne(); - $this->baseTestSearchById($document->getId()); + $this->baseTestSearchById($document->getId(), array('source' => 'folder')); } public function testSearchByContentId() { $document = ContentDocumentQuery::create()->findOne(); - $this->baseTestSearchById($document->getId()); + $this->baseTestSearchById($document->getId(), array('source' => 'content')); } public function testSearchByCategoryId() { $document = CategoryDocumentQuery::create()->findOne(); - $this->baseTestSearchById($document->getId()); - } - - public function testSearchLimit() - { - $this->baseTestSearchWithLimit(1); + $this->baseTestSearchById($document->getId(), array('source' => 'category')); } } diff --git a/core/lib/Thelia/Tests/Core/Template/Loop/ImageTest.php b/core/lib/Thelia/Tests/Core/Template/Loop/ImageTest.php index 3d2517c0a..ba4bfadc5 100644 --- a/core/lib/Thelia/Tests/Core/Template/Loop/ImageTest.php +++ b/core/lib/Thelia/Tests/Core/Template/Loop/ImageTest.php @@ -58,32 +58,27 @@ class ImageTest extends BaseLoopTestor { $image = ProductImageQuery::create()->findOne(); - $this->baseTestSearchById($image->getId()); + $this->baseTestSearchById($image->getId(), array('source' => 'product')); } public function testSearchByFolderId() { $image = FolderImageQuery::create()->findOne(); - $this->baseTestSearchById($image->getId()); + $this->baseTestSearchById($image->getId(), array('source' => 'folder')); } public function testSearchByContentId() { $image = ContentImageQuery::create()->findOne(); - $this->baseTestSearchById($image->getId()); + $this->baseTestSearchById($image->getId(), array('source' => 'content')); } public function testSearchByCategoryId() { $image = CategoryImageQuery::create()->findOne(); - $this->baseTestSearchById($image->getId()); - } - - public function testSearchLimit() - { - $this->baseTestSearchWithLimit(1); + $this->baseTestSearchById($image->getId(), array('source' => 'category')); } } diff --git a/core/lib/Thelia/Tests/Core/Template/Loop/ProductTest.php b/core/lib/Thelia/Tests/Core/Template/Loop/ProductTest.php index 1b307c5b5..07e179cbd 100755 --- a/core/lib/Thelia/Tests/Core/Template/Loop/ProductTest.php +++ b/core/lib/Thelia/Tests/Core/Template/Loop/ProductTest.php @@ -27,6 +27,7 @@ use Thelia\Model\ProductQuery; use Thelia\Tests\Core\Template\Element\BaseLoopTestor; use Thelia\Core\Template\Loop\Product; +use Propel\Runtime\ActiveQuery\Criteria; /** * @@ -52,7 +53,7 @@ class ProductTest extends BaseLoopTestor public function testSearchById() { - $product = ProductQuery::create()->findOne(); + $product = ProductQuery::create()->orderById(Criteria::ASC)->findOne(); $this->baseTestSearchById($product->getId()); } diff --git a/core/lib/Thelia/Tests/Core/Template/Loop/TaxRuleTest.php b/core/lib/Thelia/Tests/Core/Template/Loop/TaxRuleTest.php new file mode 100644 index 000000000..20523bfa5 --- /dev/null +++ b/core/lib/Thelia/Tests/Core/Template/Loop/TaxRuleTest.php @@ -0,0 +1,60 @@ +. */ +/* */ +/*************************************************************************************/ + +namespace Thelia\Tests\Core\Template\Loop; + +use Thelia\Tests\Core\Template\Element\BaseLoopTestor; + +use Thelia\Core\Template\Loop\TaxRule; +use Thelia\Model\TaxRuleQuery; + +/** + * + * @author Etienne Roudeix + * + */ +class TaxRuleTest extends BaseLoopTestor +{ + public function getTestedClassName() + { + return 'Thelia\Core\Template\Loop\TaxRule'; + } + + public function getTestedInstance() + { + return new TaxRule($this->container); + } + + public function getMandatoryArguments() + { + return array(); + } + + public function testSearchById() + { + $tr = TaxRuleQuery::create()->findOne(); + + $this->baseTestSearchById($tr->getId()); + } + +} diff --git a/core/lib/Thelia/Tests/TaxEngine/CalculatorTest.php b/core/lib/Thelia/Tests/TaxEngine/CalculatorTest.php index e0443c5ba..502b14c7e 100755 --- a/core/lib/Thelia/Tests/TaxEngine/CalculatorTest.php +++ b/core/lib/Thelia/Tests/TaxEngine/CalculatorTest.php @@ -78,7 +78,7 @@ class CalculatorTest extends \PHPUnit_Framework_TestCase public function testLoad() { - $productQuery = ProductQuery::create()->findOneById(1); + $productQuery = ProductQuery::create()->findOne(); $countryQuery = CountryQuery::create()->findOneById(64); $calculator = new Calculator(); From 8f95fe1b8b9f06f721de6c08aa58d81fff4ae9ba Mon Sep 17 00:00:00 2001 From: Manuel Raynaud Date: Wed, 18 Sep 2013 08:25:20 +0200 Subject: [PATCH 67/74] remove all tables before inserting tables creation --- core/lib/Thelia/Command/ReloadDatabaseCommand.php | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/core/lib/Thelia/Command/ReloadDatabaseCommand.php b/core/lib/Thelia/Command/ReloadDatabaseCommand.php index 70fab56d9..311b20552 100644 --- a/core/lib/Thelia/Command/ReloadDatabaseCommand.php +++ b/core/lib/Thelia/Command/ReloadDatabaseCommand.php @@ -54,6 +54,13 @@ class ReloadDatabaseCommand extends BaseModuleGenerate $connection = Propel::getConnection(\Thelia\Model\Map\ProductTableMap::DATABASE_NAME); $connection = $connection->getWrappedConnection(); + $tables = $connection->query("SHOW TABLES"); + $connection->query("SET FOREIGN_KEY_CHECKS = 0"); + foreach($tables as $table) { + $connection->query(sprintf("DROP TABLE `%s`", $table[0])); + } + $connection->query("SET FOREIGN_KEY_CHECKS = 1"); + $database = new Database($connection); $output->writeln(array( '', From bb246b320509fa2f3e8bcabf957277fcc901d6f5 Mon Sep 17 00:00:00 2001 From: Etienne Roudeix Date: Wed, 18 Sep 2013 08:55:12 +0200 Subject: [PATCH 68/74] fix test --- core/lib/Thelia/Tests/Core/Template/Loop/TaxRuleTest.php | 2 +- local/modules/Colissimo/Config/schema.xml | 7 ------- 2 files changed, 1 insertion(+), 8 deletions(-) delete mode 100755 local/modules/Colissimo/Config/schema.xml diff --git a/core/lib/Thelia/Tests/Core/Template/Loop/TaxRuleTest.php b/core/lib/Thelia/Tests/Core/Template/Loop/TaxRuleTest.php index 20523bfa5..fa24d72ee 100644 --- a/core/lib/Thelia/Tests/Core/Template/Loop/TaxRuleTest.php +++ b/core/lib/Thelia/Tests/Core/Template/Loop/TaxRuleTest.php @@ -54,7 +54,7 @@ class TaxRuleTest extends BaseLoopTestor { $tr = TaxRuleQuery::create()->findOne(); - $this->baseTestSearchById($tr->getId()); + $this->baseTestSearchById($tr->getId(), array('force_return' => true)); } } diff --git a/local/modules/Colissimo/Config/schema.xml b/local/modules/Colissimo/Config/schema.xml deleted file mode 100755 index a4e2315b0..000000000 --- a/local/modules/Colissimo/Config/schema.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - From f32f16e833e3def5427b0399872177bd7211e075 Mon Sep 17 00:00:00 2001 From: Etienne Roudeix Date: Wed, 18 Sep 2013 09:17:49 +0200 Subject: [PATCH 69/74] fix product without pse in loop --- core/lib/Thelia/Core/Template/Loop/Product.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/core/lib/Thelia/Core/Template/Loop/Product.php b/core/lib/Thelia/Core/Template/Loop/Product.php index 4a401d464..7c71e542b 100755 --- a/core/lib/Thelia/Core/Template/Loop/Product.php +++ b/core/lib/Thelia/Core/Template/Loop/Product.php @@ -597,14 +597,16 @@ class Product extends BaseI18nLoop $loopResult = new LoopResult($products); + $taxCountry = CountryQuery::create()->findPk(64); // @TODO : make it magic + foreach ($products as $product) { $loopResultRow = new LoopResultRow($loopResult, $product, $this->versionable, $this->timestampable, $this->countable); $price = $product->getRealLowestPrice(); - $taxedPrice = $product->getTaxedPrice( - CountryQuery::create()->findOneById(64) // @TODO : make it magic + $taxedPrice = null === $price ? null : $product->getTaxedPrice( + $taxCountry ); // Find previous and next product, in the default category. From 387c0d00c30b1d0f8e8a62f115ae3d8e52d5d39d Mon Sep 17 00:00:00 2001 From: Manuel Raynaud Date: Wed, 18 Sep 2013 09:34:48 +0200 Subject: [PATCH 70/74] test if cache directory exists before launching debug bar --- core/lib/Thelia/Install/CheckPermission.php | 2 + .../DebugBar/Smarty/Plugin/DebugBar.php | 12 ++- web/.htaccess | 0 web/install/bdd.php | 0 web/install/bootstrap.php | 0 web/install/config.php | 0 web/install/connection.php | 0 web/install/end.php | 0 web/install/fd33fd0-6fda040.ico | Bin web/install/footer.php | 0 web/install/header.php | 0 web/install/index.php | 0 web/install/permission.php | 0 web/install/script.js | 0 web/install/styles.css | 0 web/test_to_remove/datas_coupon_edit.json | 85 ------------------ 16 files changed, 12 insertions(+), 87 deletions(-) mode change 100644 => 100755 web/.htaccess mode change 100644 => 100755 web/install/bdd.php mode change 100644 => 100755 web/install/bootstrap.php mode change 100644 => 100755 web/install/config.php mode change 100644 => 100755 web/install/connection.php mode change 100644 => 100755 web/install/end.php mode change 100644 => 100755 web/install/fd33fd0-6fda040.ico mode change 100644 => 100755 web/install/footer.php mode change 100644 => 100755 web/install/header.php mode change 100644 => 100755 web/install/index.php mode change 100644 => 100755 web/install/permission.php mode change 100644 => 100755 web/install/script.js mode change 100644 => 100755 web/install/styles.css delete mode 100755 web/test_to_remove/datas_coupon_edit.json diff --git a/core/lib/Thelia/Install/CheckPermission.php b/core/lib/Thelia/Install/CheckPermission.php index d07b8ed83..15317211b 100644 --- a/core/lib/Thelia/Install/CheckPermission.php +++ b/core/lib/Thelia/Install/CheckPermission.php @@ -44,12 +44,14 @@ class CheckPermission extends BaseInstall const DIR_CONF = 'local/config'; const DIR_LOG = 'log'; const DIR_CACHE = 'cache'; + const DIR_WEB = 'web'; /** @var array Directory needed to be writable */ protected $directoriesToBeWritable = array( self::DIR_CONF, self::DIR_LOG, self::DIR_CACHE, + self::DIR_WEB, ); /** @var array Minimum server configuration necessary */ diff --git a/local/modules/DebugBar/Smarty/Plugin/DebugBar.php b/local/modules/DebugBar/Smarty/Plugin/DebugBar.php index 0cd1abee9..9f3cc8386 100755 --- a/local/modules/DebugBar/Smarty/Plugin/DebugBar.php +++ b/local/modules/DebugBar/Smarty/Plugin/DebugBar.php @@ -71,7 +71,11 @@ class DebugBar extends AbstractSmartyPlugin } } - file_put_contents($cssFile, $assetCss->dump()); + if(!file_exists(THELIA_WEB_DIR . "/cache")) { + @mkdir(THELIA_WEB_DIR . "/cache"); + } + + @file_put_contents($cssFile, $assetCss->dump()); } $render = sprintf('', URL::getInstance()->absoluteUrl($webFile, array(), URL::PATH_TO_FILE)); } @@ -96,7 +100,11 @@ class DebugBar extends AbstractSmartyPlugin } } - file_put_contents($cacheFile, $assetJs->dump()); + if(!file_exists(THELIA_WEB_DIR . "/cache")) { + @mkdir(THELIA_WEB_DIR . "/cache"); + } + + @file_put_contents($cacheFile, $assetJs->dump()); } $render = sprintf('', URL::getInstance()->absoluteUrl($webFile, array(), URL::PATH_TO_FILE)); diff --git a/web/.htaccess b/web/.htaccess old mode 100644 new mode 100755 diff --git a/web/install/bdd.php b/web/install/bdd.php old mode 100644 new mode 100755 diff --git a/web/install/bootstrap.php b/web/install/bootstrap.php old mode 100644 new mode 100755 diff --git a/web/install/config.php b/web/install/config.php old mode 100644 new mode 100755 diff --git a/web/install/connection.php b/web/install/connection.php old mode 100644 new mode 100755 diff --git a/web/install/end.php b/web/install/end.php old mode 100644 new mode 100755 diff --git a/web/install/fd33fd0-6fda040.ico b/web/install/fd33fd0-6fda040.ico old mode 100644 new mode 100755 diff --git a/web/install/footer.php b/web/install/footer.php old mode 100644 new mode 100755 diff --git a/web/install/header.php b/web/install/header.php old mode 100644 new mode 100755 diff --git a/web/install/index.php b/web/install/index.php old mode 100644 new mode 100755 diff --git a/web/install/permission.php b/web/install/permission.php old mode 100644 new mode 100755 diff --git a/web/install/script.js b/web/install/script.js old mode 100644 new mode 100755 diff --git a/web/install/styles.css b/web/install/styles.css old mode 100644 new mode 100755 diff --git a/web/test_to_remove/datas_coupon_edit.json b/web/test_to_remove/datas_coupon_edit.json deleted file mode 100755 index d64345682..000000000 --- a/web/test_to_remove/datas_coupon_edit.json +++ /dev/null @@ -1,85 +0,0 @@ -{ - "breadcrumb" : [ - { - "url" : "0", - "display" : "Racine", - "edit" : "", - "browse" : "" - } - ], - "categories" : [ - { - "id" : "1", - "ligne" : "1", - "classement" : "1", - "titre" : "Boyaux", - "langue_courante" : true, - "parent" : 0 - }, - { - "id" : "18", - "ligne" : "1", - "classement" : "2", - "titre" : "Epices \/ condiments", - "langue_courante" : true, - "parent" : 0 - }, - { - "id" : "100", - "ligne" : "1", - "classement" : "3", - "titre" : "Emballage", - "langue_courante" : true, - "parent" : 0 - }, - { - "id" : "194", - "ligne" : "1", - "classement" : "4", - "titre" : "Petits mat\u00e9riels", - "langue_courante" : true, - "parent" : 0 - }, - { - "id" : "355", - "ligne" : "1", - "classement" : "5", - "titre" : "Materiel de cuisine", - "langue_courante" : true, - "parent" : 0 - }, - { - "id" : "426", - "ligne" : "0", - "classement" : "6", - "titre" : "Bacs", - "langue_courante" : true, - "parent" : 0 - }, - { - "id" : "458", - "ligne" : "1", - "classement" : "7", - "titre" : "Hygi\u00e8ne & entretien", - "langue_courante" : true, - "parent" : 0 - }, - { - "id" : "592", - "ligne" : "1", - "classement" : "8", - "titre" : "Art de la table", - "langue_courante" : true, - "parent" : 0 - }, - { - "id" : "601", - "ligne" : "1", - "classement" : "9", - "titre" : "Mat\u00e9riels", - "langue_courante" : true, - "parent" : 0 - } - ], - "products":[] -} \ No newline at end of file From a041273b80c66811337978a9b5052f4d69c64ab2 Mon Sep 17 00:00:00 2001 From: Manuel Raynaud Date: Wed, 18 Sep 2013 10:34:31 +0200 Subject: [PATCH 71/74] remove unused classes --- core/lib/Thelia/Model/AttributeCategory.php | 9 - .../Thelia/Model/AttributeCategoryQuery.php | 20 - .../Model/Map/AttributeCategoryTableMap.php | 449 ------------------ .../Model/Map/FeatureCategoryTableMap.php | 449 ------------------ 4 files changed, 927 deletions(-) delete mode 100755 core/lib/Thelia/Model/AttributeCategory.php delete mode 100755 core/lib/Thelia/Model/AttributeCategoryQuery.php delete mode 100644 core/lib/Thelia/Model/Map/AttributeCategoryTableMap.php delete mode 100644 core/lib/Thelia/Model/Map/FeatureCategoryTableMap.php diff --git a/core/lib/Thelia/Model/AttributeCategory.php b/core/lib/Thelia/Model/AttributeCategory.php deleted file mode 100755 index ef1341e08..000000000 --- a/core/lib/Thelia/Model/AttributeCategory.php +++ /dev/null @@ -1,9 +0,0 @@ - array('Id', 'CategoryId', 'AttributeId', 'CreatedAt', 'UpdatedAt', ), - self::TYPE_STUDLYPHPNAME => array('id', 'categoryId', 'attributeId', 'createdAt', 'updatedAt', ), - self::TYPE_COLNAME => array(AttributeCategoryTableMap::ID, AttributeCategoryTableMap::CATEGORY_ID, AttributeCategoryTableMap::ATTRIBUTE_ID, AttributeCategoryTableMap::CREATED_AT, AttributeCategoryTableMap::UPDATED_AT, ), - self::TYPE_RAW_COLNAME => array('ID', 'CATEGORY_ID', 'ATTRIBUTE_ID', 'CREATED_AT', 'UPDATED_AT', ), - self::TYPE_FIELDNAME => array('id', 'category_id', 'attribute_id', 'created_at', 'updated_at', ), - self::TYPE_NUM => array(0, 1, 2, 3, 4, ) - ); - - /** - * 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, 'CategoryId' => 1, 'AttributeId' => 2, 'CreatedAt' => 3, 'UpdatedAt' => 4, ), - self::TYPE_STUDLYPHPNAME => array('id' => 0, 'categoryId' => 1, 'attributeId' => 2, 'createdAt' => 3, 'updatedAt' => 4, ), - self::TYPE_COLNAME => array(AttributeCategoryTableMap::ID => 0, AttributeCategoryTableMap::CATEGORY_ID => 1, AttributeCategoryTableMap::ATTRIBUTE_ID => 2, AttributeCategoryTableMap::CREATED_AT => 3, AttributeCategoryTableMap::UPDATED_AT => 4, ), - self::TYPE_RAW_COLNAME => array('ID' => 0, 'CATEGORY_ID' => 1, 'ATTRIBUTE_ID' => 2, 'CREATED_AT' => 3, 'UPDATED_AT' => 4, ), - self::TYPE_FIELDNAME => array('id' => 0, 'category_id' => 1, 'attribute_id' => 2, 'created_at' => 3, 'updated_at' => 4, ), - self::TYPE_NUM => array(0, 1, 2, 3, 4, ) - ); - - /** - * 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('attribute_category'); - $this->setPhpName('AttributeCategory'); - $this->setClassName('\\Thelia\\Model\\AttributeCategory'); - $this->setPackage('Thelia.Model'); - $this->setUseIdGenerator(true); - $this->setIsCrossRef(true); - // columns - $this->addPrimaryKey('ID', 'Id', 'INTEGER', true, null, null); - $this->addForeignKey('CATEGORY_ID', 'CategoryId', 'INTEGER', 'category', 'ID', true, null, null); - $this->addForeignKey('ATTRIBUTE_ID', 'AttributeId', 'INTEGER', 'attribute', 'ID', true, null, 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() - { - $this->addRelation('Category', '\\Thelia\\Model\\Category', RelationMap::MANY_TO_ONE, array('category_id' => 'id', ), 'CASCADE', 'RESTRICT'); - $this->addRelation('Attribute', '\\Thelia\\Model\\Attribute', RelationMap::MANY_TO_ONE, array('attribute_id' => 'id', ), 'CASCADE', 'RESTRICT'); - } // 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 ? AttributeCategoryTableMap::CLASS_DEFAULT : AttributeCategoryTableMap::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 (AttributeCategory object, last column rank) - */ - public static function populateObject($row, $offset = 0, $indexType = TableMap::TYPE_NUM) - { - $key = AttributeCategoryTableMap::getPrimaryKeyHashFromRow($row, $offset, $indexType); - if (null !== ($obj = AttributeCategoryTableMap::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 + AttributeCategoryTableMap::NUM_HYDRATE_COLUMNS; - } else { - $cls = AttributeCategoryTableMap::OM_CLASS; - $obj = new $cls(); - $col = $obj->hydrate($row, $offset, false, $indexType); - AttributeCategoryTableMap::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 = AttributeCategoryTableMap::getPrimaryKeyHashFromRow($row, 0, $dataFetcher->getIndexType()); - if (null !== ($obj = AttributeCategoryTableMap::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; - AttributeCategoryTableMap::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(AttributeCategoryTableMap::ID); - $criteria->addSelectColumn(AttributeCategoryTableMap::CATEGORY_ID); - $criteria->addSelectColumn(AttributeCategoryTableMap::ATTRIBUTE_ID); - $criteria->addSelectColumn(AttributeCategoryTableMap::CREATED_AT); - $criteria->addSelectColumn(AttributeCategoryTableMap::UPDATED_AT); - } else { - $criteria->addSelectColumn($alias . '.ID'); - $criteria->addSelectColumn($alias . '.CATEGORY_ID'); - $criteria->addSelectColumn($alias . '.ATTRIBUTE_ID'); - $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(AttributeCategoryTableMap::DATABASE_NAME)->getTable(AttributeCategoryTableMap::TABLE_NAME); - } - - /** - * Add a TableMap instance to the database for this tableMap class. - */ - public static function buildTableMap() - { - $dbMap = Propel::getServiceContainer()->getDatabaseMap(AttributeCategoryTableMap::DATABASE_NAME); - if (!$dbMap->hasTable(AttributeCategoryTableMap::TABLE_NAME)) { - $dbMap->addTableObject(new AttributeCategoryTableMap()); - } - } - - /** - * Performs a DELETE on the database, given a AttributeCategory or Criteria object OR a primary key value. - * - * @param mixed $values Criteria or AttributeCategory 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(AttributeCategoryTableMap::DATABASE_NAME); - } - - if ($values instanceof Criteria) { - // rename for clarity - $criteria = $values; - } elseif ($values instanceof \Thelia\Model\AttributeCategory) { // 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(AttributeCategoryTableMap::DATABASE_NAME); - $criteria->add(AttributeCategoryTableMap::ID, (array) $values, Criteria::IN); - } - - $query = AttributeCategoryQuery::create()->mergeWith($criteria); - - if ($values instanceof Criteria) { AttributeCategoryTableMap::clearInstancePool(); - } elseif (!is_object($values)) { // it's a primary key, or an array of pks - foreach ((array) $values as $singleval) { AttributeCategoryTableMap::removeInstanceFromPool($singleval); - } - } - - return $query->delete($con); - } - - /** - * Deletes all rows from the attribute_category 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 AttributeCategoryQuery::create()->doDeleteAll($con); - } - - /** - * Performs an INSERT on the database, given a AttributeCategory or Criteria object. - * - * @param mixed $criteria Criteria or AttributeCategory 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(AttributeCategoryTableMap::DATABASE_NAME); - } - - if ($criteria instanceof Criteria) { - $criteria = clone $criteria; // rename for clarity - } else { - $criteria = $criteria->buildCriteria(); // build Criteria from AttributeCategory object - } - - if ($criteria->containsKey(AttributeCategoryTableMap::ID) && $criteria->keyContainsValue(AttributeCategoryTableMap::ID) ) { - throw new PropelException('Cannot insert a value for auto-increment primary key ('.AttributeCategoryTableMap::ID.')'); - } - - - // Set the correct dbName - $query = AttributeCategoryQuery::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; - } - -} // AttributeCategoryTableMap -// This is the static code needed to register the TableMap for this table with the main Propel class. -// -AttributeCategoryTableMap::buildTableMap(); diff --git a/core/lib/Thelia/Model/Map/FeatureCategoryTableMap.php b/core/lib/Thelia/Model/Map/FeatureCategoryTableMap.php deleted file mode 100644 index 3e20805b6..000000000 --- a/core/lib/Thelia/Model/Map/FeatureCategoryTableMap.php +++ /dev/null @@ -1,449 +0,0 @@ - array('Id', 'FeatureId', 'CategoryId', 'CreatedAt', 'UpdatedAt', ), - self::TYPE_STUDLYPHPNAME => array('id', 'featureId', 'categoryId', 'createdAt', 'updatedAt', ), - self::TYPE_COLNAME => array(FeatureCategoryTableMap::ID, FeatureCategoryTableMap::FEATURE_ID, FeatureCategoryTableMap::CATEGORY_ID, FeatureCategoryTableMap::CREATED_AT, FeatureCategoryTableMap::UPDATED_AT, ), - self::TYPE_RAW_COLNAME => array('ID', 'FEATURE_ID', 'CATEGORY_ID', 'CREATED_AT', 'UPDATED_AT', ), - self::TYPE_FIELDNAME => array('id', 'feature_id', 'category_id', 'created_at', 'updated_at', ), - self::TYPE_NUM => array(0, 1, 2, 3, 4, ) - ); - - /** - * 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, 'FeatureId' => 1, 'CategoryId' => 2, 'CreatedAt' => 3, 'UpdatedAt' => 4, ), - self::TYPE_STUDLYPHPNAME => array('id' => 0, 'featureId' => 1, 'categoryId' => 2, 'createdAt' => 3, 'updatedAt' => 4, ), - self::TYPE_COLNAME => array(FeatureCategoryTableMap::ID => 0, FeatureCategoryTableMap::FEATURE_ID => 1, FeatureCategoryTableMap::CATEGORY_ID => 2, FeatureCategoryTableMap::CREATED_AT => 3, FeatureCategoryTableMap::UPDATED_AT => 4, ), - self::TYPE_RAW_COLNAME => array('ID' => 0, 'FEATURE_ID' => 1, 'CATEGORY_ID' => 2, 'CREATED_AT' => 3, 'UPDATED_AT' => 4, ), - self::TYPE_FIELDNAME => array('id' => 0, 'feature_id' => 1, 'category_id' => 2, 'created_at' => 3, 'updated_at' => 4, ), - self::TYPE_NUM => array(0, 1, 2, 3, 4, ) - ); - - /** - * 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('feature_category'); - $this->setPhpName('FeatureCategory'); - $this->setClassName('\\Thelia\\Model\\FeatureCategory'); - $this->setPackage('Thelia.Model'); - $this->setUseIdGenerator(true); - $this->setIsCrossRef(true); - // columns - $this->addPrimaryKey('ID', 'Id', 'INTEGER', true, null, null); - $this->addForeignKey('FEATURE_ID', 'FeatureId', 'INTEGER', 'feature', 'ID', true, null, null); - $this->addForeignKey('CATEGORY_ID', 'CategoryId', 'INTEGER', 'category', 'ID', true, null, 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() - { - $this->addRelation('Category', '\\Thelia\\Model\\Category', RelationMap::MANY_TO_ONE, array('category_id' => 'id', ), 'CASCADE', 'RESTRICT'); - $this->addRelation('Feature', '\\Thelia\\Model\\Feature', RelationMap::MANY_TO_ONE, array('feature_id' => 'id', ), 'CASCADE', 'RESTRICT'); - } // 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 ? FeatureCategoryTableMap::CLASS_DEFAULT : FeatureCategoryTableMap::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 (FeatureCategory object, last column rank) - */ - public static function populateObject($row, $offset = 0, $indexType = TableMap::TYPE_NUM) - { - $key = FeatureCategoryTableMap::getPrimaryKeyHashFromRow($row, $offset, $indexType); - if (null !== ($obj = FeatureCategoryTableMap::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 + FeatureCategoryTableMap::NUM_HYDRATE_COLUMNS; - } else { - $cls = FeatureCategoryTableMap::OM_CLASS; - $obj = new $cls(); - $col = $obj->hydrate($row, $offset, false, $indexType); - FeatureCategoryTableMap::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 = FeatureCategoryTableMap::getPrimaryKeyHashFromRow($row, 0, $dataFetcher->getIndexType()); - if (null !== ($obj = FeatureCategoryTableMap::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; - FeatureCategoryTableMap::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(FeatureCategoryTableMap::ID); - $criteria->addSelectColumn(FeatureCategoryTableMap::FEATURE_ID); - $criteria->addSelectColumn(FeatureCategoryTableMap::CATEGORY_ID); - $criteria->addSelectColumn(FeatureCategoryTableMap::CREATED_AT); - $criteria->addSelectColumn(FeatureCategoryTableMap::UPDATED_AT); - } else { - $criteria->addSelectColumn($alias . '.ID'); - $criteria->addSelectColumn($alias . '.FEATURE_ID'); - $criteria->addSelectColumn($alias . '.CATEGORY_ID'); - $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(FeatureCategoryTableMap::DATABASE_NAME)->getTable(FeatureCategoryTableMap::TABLE_NAME); - } - - /** - * Add a TableMap instance to the database for this tableMap class. - */ - public static function buildTableMap() - { - $dbMap = Propel::getServiceContainer()->getDatabaseMap(FeatureCategoryTableMap::DATABASE_NAME); - if (!$dbMap->hasTable(FeatureCategoryTableMap::TABLE_NAME)) { - $dbMap->addTableObject(new FeatureCategoryTableMap()); - } - } - - /** - * Performs a DELETE on the database, given a FeatureCategory or Criteria object OR a primary key value. - * - * @param mixed $values Criteria or FeatureCategory 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(FeatureCategoryTableMap::DATABASE_NAME); - } - - if ($values instanceof Criteria) { - // rename for clarity - $criteria = $values; - } elseif ($values instanceof \Thelia\Model\FeatureCategory) { // 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(FeatureCategoryTableMap::DATABASE_NAME); - $criteria->add(FeatureCategoryTableMap::ID, (array) $values, Criteria::IN); - } - - $query = FeatureCategoryQuery::create()->mergeWith($criteria); - - if ($values instanceof Criteria) { FeatureCategoryTableMap::clearInstancePool(); - } elseif (!is_object($values)) { // it's a primary key, or an array of pks - foreach ((array) $values as $singleval) { FeatureCategoryTableMap::removeInstanceFromPool($singleval); - } - } - - return $query->delete($con); - } - - /** - * Deletes all rows from the feature_category 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 FeatureCategoryQuery::create()->doDeleteAll($con); - } - - /** - * Performs an INSERT on the database, given a FeatureCategory or Criteria object. - * - * @param mixed $criteria Criteria or FeatureCategory 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(FeatureCategoryTableMap::DATABASE_NAME); - } - - if ($criteria instanceof Criteria) { - $criteria = clone $criteria; // rename for clarity - } else { - $criteria = $criteria->buildCriteria(); // build Criteria from FeatureCategory object - } - - if ($criteria->containsKey(FeatureCategoryTableMap::ID) && $criteria->keyContainsValue(FeatureCategoryTableMap::ID) ) { - throw new PropelException('Cannot insert a value for auto-increment primary key ('.FeatureCategoryTableMap::ID.')'); - } - - - // Set the correct dbName - $query = FeatureCategoryQuery::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; - } - -} // FeatureCategoryTableMap -// This is the static code needed to register the TableMap for this table with the main Propel class. -// -FeatureCategoryTableMap::buildTableMap(); From e7fa896866c75349a8ae93b845638060ba167dc8 Mon Sep 17 00:00:00 2001 From: Manuel Raynaud Date: Wed, 18 Sep 2013 10:52:07 +0200 Subject: [PATCH 72/74] remove unused classes --- .../Thelia/Model/Base/AttributeCategory.php | 1495 ----------------- .../Model/Base/AttributeCategoryQuery.php | 759 --------- .../lib/Thelia/Model/Base/FeatureCategory.php | 1495 ----------------- .../Model/Base/FeatureCategoryQuery.php | 759 --------- core/lib/Thelia/Model/FeatureCategory.php | 9 - .../lib/Thelia/Model/FeatureCategoryQuery.php | 20 - 6 files changed, 4537 deletions(-) delete mode 100644 core/lib/Thelia/Model/Base/AttributeCategory.php delete mode 100644 core/lib/Thelia/Model/Base/AttributeCategoryQuery.php delete mode 100644 core/lib/Thelia/Model/Base/FeatureCategory.php delete mode 100644 core/lib/Thelia/Model/Base/FeatureCategoryQuery.php delete mode 100755 core/lib/Thelia/Model/FeatureCategory.php delete mode 100755 core/lib/Thelia/Model/FeatureCategoryQuery.php diff --git a/core/lib/Thelia/Model/Base/AttributeCategory.php b/core/lib/Thelia/Model/Base/AttributeCategory.php deleted file mode 100644 index da702559a..000000000 --- a/core/lib/Thelia/Model/Base/AttributeCategory.php +++ /dev/null @@ -1,1495 +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 in_array($col, $this->modifiedColumns); - } - - /** - * 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 array_unique($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 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) { - while (false !== ($offset = array_search($col, $this->modifiedColumns))) { - array_splice($this->modifiedColumns, $offset, 1); - } - } else { - $this->modifiedColumns = array(); - } - } - - /** - * Compares this with another AttributeCategory instance. If - * obj is an instance of AttributeCategory, delegates to - * equals(AttributeCategory). Otherwise, returns false. - * - * @param obj The object to compare to. - * @return 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 - * - * @param string $name The virtual column name - * - * @return array - */ - public function getVirtualColumns() - { - return $this->virtualColumns; - } - - /** - * Checks the existence of a virtual column in this object - * - * @return boolean - */ - public function hasVirtualColumn($name) - { - return array_key_exists($name, $this->virtualColumns); - } - - /** - * Get the value of a virtual column in this object - * - * @return mixed - */ - 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 AttributeCategory 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 AttributeCategory The current object, for fluid interface - */ - public function importFrom($parser, $data) - { - if (!$parser instanceof AbstractParser) { - $parser = AbstractParser::getParser($parser); - } - - return $this->fromArray($parser->toArray($data), TableMap::TYPE_PHPNAME); - } - - /** - * 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 [category_id] column value. - * - * @return int - */ - public function getCategoryId() - { - - return $this->category_id; - } - - /** - * Get the [attribute_id] column value. - * - * @return int - */ - public function getAttributeId() - { - - return $this->attribute_id; - } - - /** - * 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 !== null ? $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 !== null ? $this->updated_at->format($format) : null; - } - } - - /** - * Set the value of [id] column. - * - * @param int $v new value - * @return \Thelia\Model\AttributeCategory 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[] = AttributeCategoryTableMap::ID; - } - - - return $this; - } // setId() - - /** - * Set the value of [category_id] column. - * - * @param int $v new value - * @return \Thelia\Model\AttributeCategory The current object (for fluent API support) - */ - public function setCategoryId($v) - { - if ($v !== null) { - $v = (int) $v; - } - - if ($this->category_id !== $v) { - $this->category_id = $v; - $this->modifiedColumns[] = AttributeCategoryTableMap::CATEGORY_ID; - } - - if ($this->aCategory !== null && $this->aCategory->getId() !== $v) { - $this->aCategory = null; - } - - - return $this; - } // setCategoryId() - - /** - * Set the value of [attribute_id] column. - * - * @param int $v new value - * @return \Thelia\Model\AttributeCategory The current object (for fluent API support) - */ - public function setAttributeId($v) - { - if ($v !== null) { - $v = (int) $v; - } - - if ($this->attribute_id !== $v) { - $this->attribute_id = $v; - $this->modifiedColumns[] = AttributeCategoryTableMap::ATTRIBUTE_ID; - } - - if ($this->aAttribute !== null && $this->aAttribute->getId() !== $v) { - $this->aAttribute = null; - } - - - return $this; - } // setAttributeId() - - /** - * 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 \Thelia\Model\AttributeCategory 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[] = AttributeCategoryTableMap::CREATED_AT; - } - } // 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 \Thelia\Model\AttributeCategory 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[] = AttributeCategoryTableMap::UPDATED_AT; - } - } // 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 : AttributeCategoryTableMap::translateFieldName('Id', TableMap::TYPE_PHPNAME, $indexType)]; - $this->id = (null !== $col) ? (int) $col : null; - - $col = $row[TableMap::TYPE_NUM == $indexType ? 1 + $startcol : AttributeCategoryTableMap::translateFieldName('CategoryId', TableMap::TYPE_PHPNAME, $indexType)]; - $this->category_id = (null !== $col) ? (int) $col : null; - - $col = $row[TableMap::TYPE_NUM == $indexType ? 2 + $startcol : AttributeCategoryTableMap::translateFieldName('AttributeId', TableMap::TYPE_PHPNAME, $indexType)]; - $this->attribute_id = (null !== $col) ? (int) $col : null; - - $col = $row[TableMap::TYPE_NUM == $indexType ? 3 + $startcol : AttributeCategoryTableMap::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 ? 4 + $startcol : AttributeCategoryTableMap::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 + 5; // 5 = AttributeCategoryTableMap::NUM_HYDRATE_COLUMNS. - - } catch (Exception $e) { - throw new PropelException("Error populating \Thelia\Model\AttributeCategory 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->aCategory !== null && $this->category_id !== $this->aCategory->getId()) { - $this->aCategory = null; - } - if ($this->aAttribute !== null && $this->attribute_id !== $this->aAttribute->getId()) { - $this->aAttribute = 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(AttributeCategoryTableMap::DATABASE_NAME); - } - - // We don't need to alter the object instance pool; we're just modifying this instance - // already in the pool. - - $dataFetcher = ChildAttributeCategoryQuery::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->aCategory = null; - $this->aAttribute = null; - } // if (deep) - } - - /** - * Removes this object from datastore and sets delete attribute. - * - * @param ConnectionInterface $con - * @return void - * @throws PropelException - * @see AttributeCategory::setDeleted() - * @see AttributeCategory::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(AttributeCategoryTableMap::DATABASE_NAME); - } - - $con->beginTransaction(); - try { - $deleteQuery = ChildAttributeCategoryQuery::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(AttributeCategoryTableMap::DATABASE_NAME); - } - - $con->beginTransaction(); - $isInsert = $this->isNew(); - try { - $ret = $this->preSave($con); - if ($isInsert) { - $ret = $ret && $this->preInsert($con); - // timestampable behavior - if (!$this->isColumnModified(AttributeCategoryTableMap::CREATED_AT)) { - $this->setCreatedAt(time()); - } - if (!$this->isColumnModified(AttributeCategoryTableMap::UPDATED_AT)) { - $this->setUpdatedAt(time()); - } - } else { - $ret = $ret && $this->preUpdate($con); - // timestampable behavior - if ($this->isModified() && !$this->isColumnModified(AttributeCategoryTableMap::UPDATED_AT)) { - $this->setUpdatedAt(time()); - } - } - if ($ret) { - $affectedRows = $this->doSave($con); - if ($isInsert) { - $this->postInsert($con); - } else { - $this->postUpdate($con); - } - $this->postSave($con); - AttributeCategoryTableMap::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->aCategory !== null) { - if ($this->aCategory->isModified() || $this->aCategory->isNew()) { - $affectedRows += $this->aCategory->save($con); - } - $this->setCategory($this->aCategory); - } - - if ($this->aAttribute !== null) { - if ($this->aAttribute->isModified() || $this->aAttribute->isNew()) { - $affectedRows += $this->aAttribute->save($con); - } - $this->setAttribute($this->aAttribute); - } - - 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[] = AttributeCategoryTableMap::ID; - if (null !== $this->id) { - throw new PropelException('Cannot insert a value for auto-increment primary key (' . AttributeCategoryTableMap::ID . ')'); - } - - // check the columns in natural order for more readable SQL queries - if ($this->isColumnModified(AttributeCategoryTableMap::ID)) { - $modifiedColumns[':p' . $index++] = 'ID'; - } - if ($this->isColumnModified(AttributeCategoryTableMap::CATEGORY_ID)) { - $modifiedColumns[':p' . $index++] = 'CATEGORY_ID'; - } - if ($this->isColumnModified(AttributeCategoryTableMap::ATTRIBUTE_ID)) { - $modifiedColumns[':p' . $index++] = 'ATTRIBUTE_ID'; - } - if ($this->isColumnModified(AttributeCategoryTableMap::CREATED_AT)) { - $modifiedColumns[':p' . $index++] = 'CREATED_AT'; - } - if ($this->isColumnModified(AttributeCategoryTableMap::UPDATED_AT)) { - $modifiedColumns[':p' . $index++] = 'UPDATED_AT'; - } - - $sql = sprintf( - 'INSERT INTO attribute_category (%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 'CATEGORY_ID': - $stmt->bindValue($identifier, $this->category_id, PDO::PARAM_INT); - break; - case 'ATTRIBUTE_ID': - $stmt->bindValue($identifier, $this->attribute_id, 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 = AttributeCategoryTableMap::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->getCategoryId(); - break; - case 2: - return $this->getAttributeId(); - break; - case 3: - return $this->getCreatedAt(); - break; - case 4: - 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 - * @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['AttributeCategory'][$this->getPrimaryKey()])) { - return '*RECURSION*'; - } - $alreadyDumpedObjects['AttributeCategory'][$this->getPrimaryKey()] = true; - $keys = AttributeCategoryTableMap::getFieldNames($keyType); - $result = array( - $keys[0] => $this->getId(), - $keys[1] => $this->getCategoryId(), - $keys[2] => $this->getAttributeId(), - $keys[3] => $this->getCreatedAt(), - $keys[4] => $this->getUpdatedAt(), - ); - $virtualColumns = $this->virtualColumns; - foreach($virtualColumns as $key => $virtualColumn) - { - $result[$key] = $virtualColumn; - } - - if ($includeForeignObjects) { - if (null !== $this->aCategory) { - $result['Category'] = $this->aCategory->toArray($keyType, $includeLazyLoadColumns, $alreadyDumpedObjects, true); - } - if (null !== $this->aAttribute) { - $result['Attribute'] = $this->aAttribute->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 = AttributeCategoryTableMap::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->setCategoryId($value); - break; - case 2: - $this->setAttributeId($value); - break; - case 3: - $this->setCreatedAt($value); - break; - case 4: - $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 = AttributeCategoryTableMap::getFieldNames($keyType); - - if (array_key_exists($keys[0], $arr)) $this->setId($arr[$keys[0]]); - if (array_key_exists($keys[1], $arr)) $this->setCategoryId($arr[$keys[1]]); - if (array_key_exists($keys[2], $arr)) $this->setAttributeId($arr[$keys[2]]); - if (array_key_exists($keys[3], $arr)) $this->setCreatedAt($arr[$keys[3]]); - if (array_key_exists($keys[4], $arr)) $this->setUpdatedAt($arr[$keys[4]]); - } - - /** - * 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(AttributeCategoryTableMap::DATABASE_NAME); - - if ($this->isColumnModified(AttributeCategoryTableMap::ID)) $criteria->add(AttributeCategoryTableMap::ID, $this->id); - if ($this->isColumnModified(AttributeCategoryTableMap::CATEGORY_ID)) $criteria->add(AttributeCategoryTableMap::CATEGORY_ID, $this->category_id); - if ($this->isColumnModified(AttributeCategoryTableMap::ATTRIBUTE_ID)) $criteria->add(AttributeCategoryTableMap::ATTRIBUTE_ID, $this->attribute_id); - if ($this->isColumnModified(AttributeCategoryTableMap::CREATED_AT)) $criteria->add(AttributeCategoryTableMap::CREATED_AT, $this->created_at); - if ($this->isColumnModified(AttributeCategoryTableMap::UPDATED_AT)) $criteria->add(AttributeCategoryTableMap::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(AttributeCategoryTableMap::DATABASE_NAME); - $criteria->add(AttributeCategoryTableMap::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 \Thelia\Model\AttributeCategory (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->setCategoryId($this->getCategoryId()); - $copyObj->setAttributeId($this->getAttributeId()); - $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 \Thelia\Model\AttributeCategory 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 ChildCategory object. - * - * @param ChildCategory $v - * @return \Thelia\Model\AttributeCategory The current object (for fluent API support) - * @throws PropelException - */ - public function setCategory(ChildCategory $v = null) - { - if ($v === null) { - $this->setCategoryId(NULL); - } else { - $this->setCategoryId($v->getId()); - } - - $this->aCategory = $v; - - // Add binding for other direction of this n:n relationship. - // If this object has already been added to the ChildCategory object, it will not be re-added. - if ($v !== null) { - $v->addAttributeCategory($this); - } - - - return $this; - } - - - /** - * Get the associated ChildCategory object - * - * @param ConnectionInterface $con Optional Connection object. - * @return ChildCategory The associated ChildCategory object. - * @throws PropelException - */ - public function getCategory(ConnectionInterface $con = null) - { - if ($this->aCategory === null && ($this->category_id !== null)) { - $this->aCategory = ChildCategoryQuery::create()->findPk($this->category_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->aCategory->addAttributeCategories($this); - */ - } - - return $this->aCategory; - } - - /** - * Declares an association between this object and a ChildAttribute object. - * - * @param ChildAttribute $v - * @return \Thelia\Model\AttributeCategory The current object (for fluent API support) - * @throws PropelException - */ - public function setAttribute(ChildAttribute $v = null) - { - if ($v === null) { - $this->setAttributeId(NULL); - } else { - $this->setAttributeId($v->getId()); - } - - $this->aAttribute = $v; - - // Add binding for other direction of this n:n relationship. - // If this object has already been added to the ChildAttribute object, it will not be re-added. - if ($v !== null) { - $v->addAttributeCategory($this); - } - - - return $this; - } - - - /** - * Get the associated ChildAttribute object - * - * @param ConnectionInterface $con Optional Connection object. - * @return ChildAttribute The associated ChildAttribute object. - * @throws PropelException - */ - public function getAttribute(ConnectionInterface $con = null) - { - if ($this->aAttribute === null && ($this->attribute_id !== null)) { - $this->aAttribute = ChildAttributeQuery::create()->findPk($this->attribute_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->aAttribute->addAttributeCategories($this); - */ - } - - return $this->aAttribute; - } - - /** - * Clears the current object and sets all attributes to their default values - */ - public function clear() - { - $this->id = null; - $this->category_id = null; - $this->attribute_id = 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) - - $this->aCategory = null; - $this->aAttribute = null; - } - - /** - * Return the string representation of this object - * - * @return string - */ - public function __toString() - { - return (string) $this->exportTo(AttributeCategoryTableMap::DEFAULT_STRING_FORMAT); - } - - // timestampable behavior - - /** - * Mark the current object so that the update date doesn't get updated during next save - * - * @return ChildAttributeCategory The current object (for fluent API support) - */ - public function keepUpdateDateUnchanged() - { - $this->modifiedColumns[] = AttributeCategoryTableMap::UPDATED_AT; - - 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/core/lib/Thelia/Model/Base/AttributeCategoryQuery.php b/core/lib/Thelia/Model/Base/AttributeCategoryQuery.php deleted file mode 100644 index d325d2037..000000000 --- a/core/lib/Thelia/Model/Base/AttributeCategoryQuery.php +++ /dev/null @@ -1,759 +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 ChildAttributeCategory|array|mixed the result, formatted by the current formatter - */ - public function findPk($key, $con = null) - { - if ($key === null) { - return null; - } - if ((null !== ($obj = AttributeCategoryTableMap::getInstanceFromPool((string) $key))) && !$this->formatter) { - // the object is already in the instance pool - return $obj; - } - if ($con === null) { - $con = Propel::getServiceContainer()->getReadConnection(AttributeCategoryTableMap::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 ChildAttributeCategory A model object, or null if the key is not found - */ - protected function findPkSimple($key, $con) - { - $sql = 'SELECT ID, CATEGORY_ID, ATTRIBUTE_ID, CREATED_AT, UPDATED_AT FROM attribute_category 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 ChildAttributeCategory(); - $obj->hydrate($row); - AttributeCategoryTableMap::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 ChildAttributeCategory|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 ChildAttributeCategoryQuery The current query, for fluid interface - */ - public function filterByPrimaryKey($key) - { - - return $this->addUsingAlias(AttributeCategoryTableMap::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 ChildAttributeCategoryQuery The current query, for fluid interface - */ - public function filterByPrimaryKeys($keys) - { - - return $this->addUsingAlias(AttributeCategoryTableMap::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 ChildAttributeCategoryQuery 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(AttributeCategoryTableMap::ID, $id['min'], Criteria::GREATER_EQUAL); - $useMinMax = true; - } - if (isset($id['max'])) { - $this->addUsingAlias(AttributeCategoryTableMap::ID, $id['max'], Criteria::LESS_EQUAL); - $useMinMax = true; - } - if ($useMinMax) { - return $this; - } - if (null === $comparison) { - $comparison = Criteria::IN; - } - } - - return $this->addUsingAlias(AttributeCategoryTableMap::ID, $id, $comparison); - } - - /** - * Filter the query on the category_id column - * - * Example usage: - * - * $query->filterByCategoryId(1234); // WHERE category_id = 1234 - * $query->filterByCategoryId(array(12, 34)); // WHERE category_id IN (12, 34) - * $query->filterByCategoryId(array('min' => 12)); // WHERE category_id > 12 - * - * - * @see filterByCategory() - * - * @param mixed $categoryId 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 ChildAttributeCategoryQuery The current query, for fluid interface - */ - public function filterByCategoryId($categoryId = null, $comparison = null) - { - if (is_array($categoryId)) { - $useMinMax = false; - if (isset($categoryId['min'])) { - $this->addUsingAlias(AttributeCategoryTableMap::CATEGORY_ID, $categoryId['min'], Criteria::GREATER_EQUAL); - $useMinMax = true; - } - if (isset($categoryId['max'])) { - $this->addUsingAlias(AttributeCategoryTableMap::CATEGORY_ID, $categoryId['max'], Criteria::LESS_EQUAL); - $useMinMax = true; - } - if ($useMinMax) { - return $this; - } - if (null === $comparison) { - $comparison = Criteria::IN; - } - } - - return $this->addUsingAlias(AttributeCategoryTableMap::CATEGORY_ID, $categoryId, $comparison); - } - - /** - * Filter the query on the attribute_id column - * - * Example usage: - * - * $query->filterByAttributeId(1234); // WHERE attribute_id = 1234 - * $query->filterByAttributeId(array(12, 34)); // WHERE attribute_id IN (12, 34) - * $query->filterByAttributeId(array('min' => 12)); // WHERE attribute_id > 12 - * - * - * @see filterByAttribute() - * - * @param mixed $attributeId 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 ChildAttributeCategoryQuery The current query, for fluid interface - */ - public function filterByAttributeId($attributeId = null, $comparison = null) - { - if (is_array($attributeId)) { - $useMinMax = false; - if (isset($attributeId['min'])) { - $this->addUsingAlias(AttributeCategoryTableMap::ATTRIBUTE_ID, $attributeId['min'], Criteria::GREATER_EQUAL); - $useMinMax = true; - } - if (isset($attributeId['max'])) { - $this->addUsingAlias(AttributeCategoryTableMap::ATTRIBUTE_ID, $attributeId['max'], Criteria::LESS_EQUAL); - $useMinMax = true; - } - if ($useMinMax) { - return $this; - } - if (null === $comparison) { - $comparison = Criteria::IN; - } - } - - return $this->addUsingAlias(AttributeCategoryTableMap::ATTRIBUTE_ID, $attributeId, $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 ChildAttributeCategoryQuery 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(AttributeCategoryTableMap::CREATED_AT, $createdAt['min'], Criteria::GREATER_EQUAL); - $useMinMax = true; - } - if (isset($createdAt['max'])) { - $this->addUsingAlias(AttributeCategoryTableMap::CREATED_AT, $createdAt['max'], Criteria::LESS_EQUAL); - $useMinMax = true; - } - if ($useMinMax) { - return $this; - } - if (null === $comparison) { - $comparison = Criteria::IN; - } - } - - return $this->addUsingAlias(AttributeCategoryTableMap::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 ChildAttributeCategoryQuery 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(AttributeCategoryTableMap::UPDATED_AT, $updatedAt['min'], Criteria::GREATER_EQUAL); - $useMinMax = true; - } - if (isset($updatedAt['max'])) { - $this->addUsingAlias(AttributeCategoryTableMap::UPDATED_AT, $updatedAt['max'], Criteria::LESS_EQUAL); - $useMinMax = true; - } - if ($useMinMax) { - return $this; - } - if (null === $comparison) { - $comparison = Criteria::IN; - } - } - - return $this->addUsingAlias(AttributeCategoryTableMap::UPDATED_AT, $updatedAt, $comparison); - } - - /** - * Filter the query by a related \Thelia\Model\Category object - * - * @param \Thelia\Model\Category|ObjectCollection $category The related object(s) to use as filter - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL - * - * @return ChildAttributeCategoryQuery The current query, for fluid interface - */ - public function filterByCategory($category, $comparison = null) - { - if ($category instanceof \Thelia\Model\Category) { - return $this - ->addUsingAlias(AttributeCategoryTableMap::CATEGORY_ID, $category->getId(), $comparison); - } elseif ($category instanceof ObjectCollection) { - if (null === $comparison) { - $comparison = Criteria::IN; - } - - return $this - ->addUsingAlias(AttributeCategoryTableMap::CATEGORY_ID, $category->toKeyValue('PrimaryKey', 'Id'), $comparison); - } else { - throw new PropelException('filterByCategory() only accepts arguments of type \Thelia\Model\Category or Collection'); - } - } - - /** - * Adds a JOIN clause to the query using the Category relation - * - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' - * - * @return ChildAttributeCategoryQuery The current query, for fluid interface - */ - public function joinCategory($relationAlias = null, $joinType = Criteria::INNER_JOIN) - { - $tableMap = $this->getTableMap(); - $relationMap = $tableMap->getRelation('Category'); - - // 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, 'Category'); - } - - return $this; - } - - /** - * Use the Category relation Category 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 \Thelia\Model\CategoryQuery A secondary query class using the current class as primary query - */ - public function useCategoryQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN) - { - return $this - ->joinCategory($relationAlias, $joinType) - ->useQuery($relationAlias ? $relationAlias : 'Category', '\Thelia\Model\CategoryQuery'); - } - - /** - * Filter the query by a related \Thelia\Model\Attribute object - * - * @param \Thelia\Model\Attribute|ObjectCollection $attribute The related object(s) to use as filter - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL - * - * @return ChildAttributeCategoryQuery The current query, for fluid interface - */ - public function filterByAttribute($attribute, $comparison = null) - { - if ($attribute instanceof \Thelia\Model\Attribute) { - return $this - ->addUsingAlias(AttributeCategoryTableMap::ATTRIBUTE_ID, $attribute->getId(), $comparison); - } elseif ($attribute instanceof ObjectCollection) { - if (null === $comparison) { - $comparison = Criteria::IN; - } - - return $this - ->addUsingAlias(AttributeCategoryTableMap::ATTRIBUTE_ID, $attribute->toKeyValue('PrimaryKey', 'Id'), $comparison); - } else { - throw new PropelException('filterByAttribute() only accepts arguments of type \Thelia\Model\Attribute or Collection'); - } - } - - /** - * Adds a JOIN clause to the query using the Attribute relation - * - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' - * - * @return ChildAttributeCategoryQuery The current query, for fluid interface - */ - public function joinAttribute($relationAlias = null, $joinType = Criteria::INNER_JOIN) - { - $tableMap = $this->getTableMap(); - $relationMap = $tableMap->getRelation('Attribute'); - - // 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, 'Attribute'); - } - - return $this; - } - - /** - * Use the Attribute relation Attribute 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 \Thelia\Model\AttributeQuery A secondary query class using the current class as primary query - */ - public function useAttributeQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN) - { - return $this - ->joinAttribute($relationAlias, $joinType) - ->useQuery($relationAlias ? $relationAlias : 'Attribute', '\Thelia\Model\AttributeQuery'); - } - - /** - * Exclude object from result - * - * @param ChildAttributeCategory $attributeCategory Object to remove from the list of results - * - * @return ChildAttributeCategoryQuery The current query, for fluid interface - */ - public function prune($attributeCategory = null) - { - if ($attributeCategory) { - $this->addUsingAlias(AttributeCategoryTableMap::ID, $attributeCategory->getId(), Criteria::NOT_EQUAL); - } - - return $this; - } - - /** - * Deletes all rows from the attribute_category 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(AttributeCategoryTableMap::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). - AttributeCategoryTableMap::clearInstancePool(); - AttributeCategoryTableMap::clearRelatedInstancePool(); - - $con->commit(); - } catch (PropelException $e) { - $con->rollBack(); - throw $e; - } - - return $affectedRows; - } - - /** - * Performs a DELETE on the database, given a ChildAttributeCategory or Criteria object OR a primary key value. - * - * @param mixed $values Criteria or ChildAttributeCategory 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(AttributeCategoryTableMap::DATABASE_NAME); - } - - $criteria = $this; - - // Set the correct dbName - $criteria->setDbName(AttributeCategoryTableMap::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(); - - - AttributeCategoryTableMap::removeInstanceFromPool($criteria); - - $affectedRows += ModelCriteria::delete($con); - AttributeCategoryTableMap::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 ChildAttributeCategoryQuery The current query, for fluid interface - */ - public function recentlyUpdated($nbDays = 7) - { - return $this->addUsingAlias(AttributeCategoryTableMap::UPDATED_AT, time() - $nbDays * 24 * 60 * 60, Criteria::GREATER_EQUAL); - } - - /** - * Filter by the latest created - * - * @param int $nbDays Maximum age of in days - * - * @return ChildAttributeCategoryQuery The current query, for fluid interface - */ - public function recentlyCreated($nbDays = 7) - { - return $this->addUsingAlias(AttributeCategoryTableMap::CREATED_AT, time() - $nbDays * 24 * 60 * 60, Criteria::GREATER_EQUAL); - } - - /** - * Order by update date desc - * - * @return ChildAttributeCategoryQuery The current query, for fluid interface - */ - public function lastUpdatedFirst() - { - return $this->addDescendingOrderByColumn(AttributeCategoryTableMap::UPDATED_AT); - } - - /** - * Order by update date asc - * - * @return ChildAttributeCategoryQuery The current query, for fluid interface - */ - public function firstUpdatedFirst() - { - return $this->addAscendingOrderByColumn(AttributeCategoryTableMap::UPDATED_AT); - } - - /** - * Order by create date desc - * - * @return ChildAttributeCategoryQuery The current query, for fluid interface - */ - public function lastCreatedFirst() - { - return $this->addDescendingOrderByColumn(AttributeCategoryTableMap::CREATED_AT); - } - - /** - * Order by create date asc - * - * @return ChildAttributeCategoryQuery The current query, for fluid interface - */ - public function firstCreatedFirst() - { - return $this->addAscendingOrderByColumn(AttributeCategoryTableMap::CREATED_AT); - } - -} // AttributeCategoryQuery diff --git a/core/lib/Thelia/Model/Base/FeatureCategory.php b/core/lib/Thelia/Model/Base/FeatureCategory.php deleted file mode 100644 index 035e077d2..000000000 --- a/core/lib/Thelia/Model/Base/FeatureCategory.php +++ /dev/null @@ -1,1495 +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 in_array($col, $this->modifiedColumns); - } - - /** - * 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 array_unique($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 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) { - while (false !== ($offset = array_search($col, $this->modifiedColumns))) { - array_splice($this->modifiedColumns, $offset, 1); - } - } else { - $this->modifiedColumns = array(); - } - } - - /** - * Compares this with another FeatureCategory instance. If - * obj is an instance of FeatureCategory, delegates to - * equals(FeatureCategory). Otherwise, returns false. - * - * @param obj The object to compare to. - * @return 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 - * - * @param string $name The virtual column name - * - * @return array - */ - public function getVirtualColumns() - { - return $this->virtualColumns; - } - - /** - * Checks the existence of a virtual column in this object - * - * @return boolean - */ - public function hasVirtualColumn($name) - { - return array_key_exists($name, $this->virtualColumns); - } - - /** - * Get the value of a virtual column in this object - * - * @return mixed - */ - 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 FeatureCategory 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 FeatureCategory The current object, for fluid interface - */ - public function importFrom($parser, $data) - { - if (!$parser instanceof AbstractParser) { - $parser = AbstractParser::getParser($parser); - } - - return $this->fromArray($parser->toArray($data), TableMap::TYPE_PHPNAME); - } - - /** - * 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 [feature_id] column value. - * - * @return int - */ - public function getFeatureId() - { - - return $this->feature_id; - } - - /** - * Get the [category_id] column value. - * - * @return int - */ - public function getCategoryId() - { - - return $this->category_id; - } - - /** - * 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 !== null ? $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 !== null ? $this->updated_at->format($format) : null; - } - } - - /** - * Set the value of [id] column. - * - * @param int $v new value - * @return \Thelia\Model\FeatureCategory 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[] = FeatureCategoryTableMap::ID; - } - - - return $this; - } // setId() - - /** - * Set the value of [feature_id] column. - * - * @param int $v new value - * @return \Thelia\Model\FeatureCategory The current object (for fluent API support) - */ - public function setFeatureId($v) - { - if ($v !== null) { - $v = (int) $v; - } - - if ($this->feature_id !== $v) { - $this->feature_id = $v; - $this->modifiedColumns[] = FeatureCategoryTableMap::FEATURE_ID; - } - - if ($this->aFeature !== null && $this->aFeature->getId() !== $v) { - $this->aFeature = null; - } - - - return $this; - } // setFeatureId() - - /** - * Set the value of [category_id] column. - * - * @param int $v new value - * @return \Thelia\Model\FeatureCategory The current object (for fluent API support) - */ - public function setCategoryId($v) - { - if ($v !== null) { - $v = (int) $v; - } - - if ($this->category_id !== $v) { - $this->category_id = $v; - $this->modifiedColumns[] = FeatureCategoryTableMap::CATEGORY_ID; - } - - if ($this->aCategory !== null && $this->aCategory->getId() !== $v) { - $this->aCategory = null; - } - - - return $this; - } // setCategoryId() - - /** - * 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 \Thelia\Model\FeatureCategory 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[] = FeatureCategoryTableMap::CREATED_AT; - } - } // 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 \Thelia\Model\FeatureCategory 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[] = FeatureCategoryTableMap::UPDATED_AT; - } - } // 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 : FeatureCategoryTableMap::translateFieldName('Id', TableMap::TYPE_PHPNAME, $indexType)]; - $this->id = (null !== $col) ? (int) $col : null; - - $col = $row[TableMap::TYPE_NUM == $indexType ? 1 + $startcol : FeatureCategoryTableMap::translateFieldName('FeatureId', TableMap::TYPE_PHPNAME, $indexType)]; - $this->feature_id = (null !== $col) ? (int) $col : null; - - $col = $row[TableMap::TYPE_NUM == $indexType ? 2 + $startcol : FeatureCategoryTableMap::translateFieldName('CategoryId', TableMap::TYPE_PHPNAME, $indexType)]; - $this->category_id = (null !== $col) ? (int) $col : null; - - $col = $row[TableMap::TYPE_NUM == $indexType ? 3 + $startcol : FeatureCategoryTableMap::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 ? 4 + $startcol : FeatureCategoryTableMap::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 + 5; // 5 = FeatureCategoryTableMap::NUM_HYDRATE_COLUMNS. - - } catch (Exception $e) { - throw new PropelException("Error populating \Thelia\Model\FeatureCategory 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->aFeature !== null && $this->feature_id !== $this->aFeature->getId()) { - $this->aFeature = null; - } - if ($this->aCategory !== null && $this->category_id !== $this->aCategory->getId()) { - $this->aCategory = 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(FeatureCategoryTableMap::DATABASE_NAME); - } - - // We don't need to alter the object instance pool; we're just modifying this instance - // already in the pool. - - $dataFetcher = ChildFeatureCategoryQuery::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->aCategory = null; - $this->aFeature = null; - } // if (deep) - } - - /** - * Removes this object from datastore and sets delete attribute. - * - * @param ConnectionInterface $con - * @return void - * @throws PropelException - * @see FeatureCategory::setDeleted() - * @see FeatureCategory::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(FeatureCategoryTableMap::DATABASE_NAME); - } - - $con->beginTransaction(); - try { - $deleteQuery = ChildFeatureCategoryQuery::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(FeatureCategoryTableMap::DATABASE_NAME); - } - - $con->beginTransaction(); - $isInsert = $this->isNew(); - try { - $ret = $this->preSave($con); - if ($isInsert) { - $ret = $ret && $this->preInsert($con); - // timestampable behavior - if (!$this->isColumnModified(FeatureCategoryTableMap::CREATED_AT)) { - $this->setCreatedAt(time()); - } - if (!$this->isColumnModified(FeatureCategoryTableMap::UPDATED_AT)) { - $this->setUpdatedAt(time()); - } - } else { - $ret = $ret && $this->preUpdate($con); - // timestampable behavior - if ($this->isModified() && !$this->isColumnModified(FeatureCategoryTableMap::UPDATED_AT)) { - $this->setUpdatedAt(time()); - } - } - if ($ret) { - $affectedRows = $this->doSave($con); - if ($isInsert) { - $this->postInsert($con); - } else { - $this->postUpdate($con); - } - $this->postSave($con); - FeatureCategoryTableMap::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->aCategory !== null) { - if ($this->aCategory->isModified() || $this->aCategory->isNew()) { - $affectedRows += $this->aCategory->save($con); - } - $this->setCategory($this->aCategory); - } - - if ($this->aFeature !== null) { - if ($this->aFeature->isModified() || $this->aFeature->isNew()) { - $affectedRows += $this->aFeature->save($con); - } - $this->setFeature($this->aFeature); - } - - 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[] = FeatureCategoryTableMap::ID; - if (null !== $this->id) { - throw new PropelException('Cannot insert a value for auto-increment primary key (' . FeatureCategoryTableMap::ID . ')'); - } - - // check the columns in natural order for more readable SQL queries - if ($this->isColumnModified(FeatureCategoryTableMap::ID)) { - $modifiedColumns[':p' . $index++] = 'ID'; - } - if ($this->isColumnModified(FeatureCategoryTableMap::FEATURE_ID)) { - $modifiedColumns[':p' . $index++] = 'FEATURE_ID'; - } - if ($this->isColumnModified(FeatureCategoryTableMap::CATEGORY_ID)) { - $modifiedColumns[':p' . $index++] = 'CATEGORY_ID'; - } - if ($this->isColumnModified(FeatureCategoryTableMap::CREATED_AT)) { - $modifiedColumns[':p' . $index++] = 'CREATED_AT'; - } - if ($this->isColumnModified(FeatureCategoryTableMap::UPDATED_AT)) { - $modifiedColumns[':p' . $index++] = 'UPDATED_AT'; - } - - $sql = sprintf( - 'INSERT INTO feature_category (%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 'FEATURE_ID': - $stmt->bindValue($identifier, $this->feature_id, PDO::PARAM_INT); - break; - case 'CATEGORY_ID': - $stmt->bindValue($identifier, $this->category_id, 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 = FeatureCategoryTableMap::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->getFeatureId(); - break; - case 2: - return $this->getCategoryId(); - break; - case 3: - return $this->getCreatedAt(); - break; - case 4: - 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 - * @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['FeatureCategory'][$this->getPrimaryKey()])) { - return '*RECURSION*'; - } - $alreadyDumpedObjects['FeatureCategory'][$this->getPrimaryKey()] = true; - $keys = FeatureCategoryTableMap::getFieldNames($keyType); - $result = array( - $keys[0] => $this->getId(), - $keys[1] => $this->getFeatureId(), - $keys[2] => $this->getCategoryId(), - $keys[3] => $this->getCreatedAt(), - $keys[4] => $this->getUpdatedAt(), - ); - $virtualColumns = $this->virtualColumns; - foreach($virtualColumns as $key => $virtualColumn) - { - $result[$key] = $virtualColumn; - } - - if ($includeForeignObjects) { - if (null !== $this->aCategory) { - $result['Category'] = $this->aCategory->toArray($keyType, $includeLazyLoadColumns, $alreadyDumpedObjects, true); - } - if (null !== $this->aFeature) { - $result['Feature'] = $this->aFeature->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 = FeatureCategoryTableMap::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->setFeatureId($value); - break; - case 2: - $this->setCategoryId($value); - break; - case 3: - $this->setCreatedAt($value); - break; - case 4: - $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 = FeatureCategoryTableMap::getFieldNames($keyType); - - if (array_key_exists($keys[0], $arr)) $this->setId($arr[$keys[0]]); - if (array_key_exists($keys[1], $arr)) $this->setFeatureId($arr[$keys[1]]); - if (array_key_exists($keys[2], $arr)) $this->setCategoryId($arr[$keys[2]]); - if (array_key_exists($keys[3], $arr)) $this->setCreatedAt($arr[$keys[3]]); - if (array_key_exists($keys[4], $arr)) $this->setUpdatedAt($arr[$keys[4]]); - } - - /** - * 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(FeatureCategoryTableMap::DATABASE_NAME); - - if ($this->isColumnModified(FeatureCategoryTableMap::ID)) $criteria->add(FeatureCategoryTableMap::ID, $this->id); - if ($this->isColumnModified(FeatureCategoryTableMap::FEATURE_ID)) $criteria->add(FeatureCategoryTableMap::FEATURE_ID, $this->feature_id); - if ($this->isColumnModified(FeatureCategoryTableMap::CATEGORY_ID)) $criteria->add(FeatureCategoryTableMap::CATEGORY_ID, $this->category_id); - if ($this->isColumnModified(FeatureCategoryTableMap::CREATED_AT)) $criteria->add(FeatureCategoryTableMap::CREATED_AT, $this->created_at); - if ($this->isColumnModified(FeatureCategoryTableMap::UPDATED_AT)) $criteria->add(FeatureCategoryTableMap::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(FeatureCategoryTableMap::DATABASE_NAME); - $criteria->add(FeatureCategoryTableMap::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 \Thelia\Model\FeatureCategory (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->setFeatureId($this->getFeatureId()); - $copyObj->setCategoryId($this->getCategoryId()); - $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 \Thelia\Model\FeatureCategory 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 ChildCategory object. - * - * @param ChildCategory $v - * @return \Thelia\Model\FeatureCategory The current object (for fluent API support) - * @throws PropelException - */ - public function setCategory(ChildCategory $v = null) - { - if ($v === null) { - $this->setCategoryId(NULL); - } else { - $this->setCategoryId($v->getId()); - } - - $this->aCategory = $v; - - // Add binding for other direction of this n:n relationship. - // If this object has already been added to the ChildCategory object, it will not be re-added. - if ($v !== null) { - $v->addFeatureCategory($this); - } - - - return $this; - } - - - /** - * Get the associated ChildCategory object - * - * @param ConnectionInterface $con Optional Connection object. - * @return ChildCategory The associated ChildCategory object. - * @throws PropelException - */ - public function getCategory(ConnectionInterface $con = null) - { - if ($this->aCategory === null && ($this->category_id !== null)) { - $this->aCategory = ChildCategoryQuery::create()->findPk($this->category_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->aCategory->addFeatureCategories($this); - */ - } - - return $this->aCategory; - } - - /** - * Declares an association between this object and a ChildFeature object. - * - * @param ChildFeature $v - * @return \Thelia\Model\FeatureCategory The current object (for fluent API support) - * @throws PropelException - */ - public function setFeature(ChildFeature $v = null) - { - if ($v === null) { - $this->setFeatureId(NULL); - } else { - $this->setFeatureId($v->getId()); - } - - $this->aFeature = $v; - - // Add binding for other direction of this n:n relationship. - // If this object has already been added to the ChildFeature object, it will not be re-added. - if ($v !== null) { - $v->addFeatureCategory($this); - } - - - return $this; - } - - - /** - * Get the associated ChildFeature object - * - * @param ConnectionInterface $con Optional Connection object. - * @return ChildFeature The associated ChildFeature object. - * @throws PropelException - */ - public function getFeature(ConnectionInterface $con = null) - { - if ($this->aFeature === null && ($this->feature_id !== null)) { - $this->aFeature = ChildFeatureQuery::create()->findPk($this->feature_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->aFeature->addFeatureCategories($this); - */ - } - - return $this->aFeature; - } - - /** - * Clears the current object and sets all attributes to their default values - */ - public function clear() - { - $this->id = null; - $this->feature_id = null; - $this->category_id = 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) - - $this->aCategory = null; - $this->aFeature = null; - } - - /** - * Return the string representation of this object - * - * @return string - */ - public function __toString() - { - return (string) $this->exportTo(FeatureCategoryTableMap::DEFAULT_STRING_FORMAT); - } - - // timestampable behavior - - /** - * Mark the current object so that the update date doesn't get updated during next save - * - * @return ChildFeatureCategory The current object (for fluent API support) - */ - public function keepUpdateDateUnchanged() - { - $this->modifiedColumns[] = FeatureCategoryTableMap::UPDATED_AT; - - 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/core/lib/Thelia/Model/Base/FeatureCategoryQuery.php b/core/lib/Thelia/Model/Base/FeatureCategoryQuery.php deleted file mode 100644 index b9c9a67be..000000000 --- a/core/lib/Thelia/Model/Base/FeatureCategoryQuery.php +++ /dev/null @@ -1,759 +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 ChildFeatureCategory|array|mixed the result, formatted by the current formatter - */ - public function findPk($key, $con = null) - { - if ($key === null) { - return null; - } - if ((null !== ($obj = FeatureCategoryTableMap::getInstanceFromPool((string) $key))) && !$this->formatter) { - // the object is already in the instance pool - return $obj; - } - if ($con === null) { - $con = Propel::getServiceContainer()->getReadConnection(FeatureCategoryTableMap::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 ChildFeatureCategory A model object, or null if the key is not found - */ - protected function findPkSimple($key, $con) - { - $sql = 'SELECT ID, FEATURE_ID, CATEGORY_ID, CREATED_AT, UPDATED_AT FROM feature_category 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 ChildFeatureCategory(); - $obj->hydrate($row); - FeatureCategoryTableMap::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 ChildFeatureCategory|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 ChildFeatureCategoryQuery The current query, for fluid interface - */ - public function filterByPrimaryKey($key) - { - - return $this->addUsingAlias(FeatureCategoryTableMap::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 ChildFeatureCategoryQuery The current query, for fluid interface - */ - public function filterByPrimaryKeys($keys) - { - - return $this->addUsingAlias(FeatureCategoryTableMap::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 ChildFeatureCategoryQuery 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(FeatureCategoryTableMap::ID, $id['min'], Criteria::GREATER_EQUAL); - $useMinMax = true; - } - if (isset($id['max'])) { - $this->addUsingAlias(FeatureCategoryTableMap::ID, $id['max'], Criteria::LESS_EQUAL); - $useMinMax = true; - } - if ($useMinMax) { - return $this; - } - if (null === $comparison) { - $comparison = Criteria::IN; - } - } - - return $this->addUsingAlias(FeatureCategoryTableMap::ID, $id, $comparison); - } - - /** - * Filter the query on the feature_id column - * - * Example usage: - * - * $query->filterByFeatureId(1234); // WHERE feature_id = 1234 - * $query->filterByFeatureId(array(12, 34)); // WHERE feature_id IN (12, 34) - * $query->filterByFeatureId(array('min' => 12)); // WHERE feature_id > 12 - * - * - * @see filterByFeature() - * - * @param mixed $featureId 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 ChildFeatureCategoryQuery The current query, for fluid interface - */ - public function filterByFeatureId($featureId = null, $comparison = null) - { - if (is_array($featureId)) { - $useMinMax = false; - if (isset($featureId['min'])) { - $this->addUsingAlias(FeatureCategoryTableMap::FEATURE_ID, $featureId['min'], Criteria::GREATER_EQUAL); - $useMinMax = true; - } - if (isset($featureId['max'])) { - $this->addUsingAlias(FeatureCategoryTableMap::FEATURE_ID, $featureId['max'], Criteria::LESS_EQUAL); - $useMinMax = true; - } - if ($useMinMax) { - return $this; - } - if (null === $comparison) { - $comparison = Criteria::IN; - } - } - - return $this->addUsingAlias(FeatureCategoryTableMap::FEATURE_ID, $featureId, $comparison); - } - - /** - * Filter the query on the category_id column - * - * Example usage: - * - * $query->filterByCategoryId(1234); // WHERE category_id = 1234 - * $query->filterByCategoryId(array(12, 34)); // WHERE category_id IN (12, 34) - * $query->filterByCategoryId(array('min' => 12)); // WHERE category_id > 12 - * - * - * @see filterByCategory() - * - * @param mixed $categoryId 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 ChildFeatureCategoryQuery The current query, for fluid interface - */ - public function filterByCategoryId($categoryId = null, $comparison = null) - { - if (is_array($categoryId)) { - $useMinMax = false; - if (isset($categoryId['min'])) { - $this->addUsingAlias(FeatureCategoryTableMap::CATEGORY_ID, $categoryId['min'], Criteria::GREATER_EQUAL); - $useMinMax = true; - } - if (isset($categoryId['max'])) { - $this->addUsingAlias(FeatureCategoryTableMap::CATEGORY_ID, $categoryId['max'], Criteria::LESS_EQUAL); - $useMinMax = true; - } - if ($useMinMax) { - return $this; - } - if (null === $comparison) { - $comparison = Criteria::IN; - } - } - - return $this->addUsingAlias(FeatureCategoryTableMap::CATEGORY_ID, $categoryId, $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 ChildFeatureCategoryQuery 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(FeatureCategoryTableMap::CREATED_AT, $createdAt['min'], Criteria::GREATER_EQUAL); - $useMinMax = true; - } - if (isset($createdAt['max'])) { - $this->addUsingAlias(FeatureCategoryTableMap::CREATED_AT, $createdAt['max'], Criteria::LESS_EQUAL); - $useMinMax = true; - } - if ($useMinMax) { - return $this; - } - if (null === $comparison) { - $comparison = Criteria::IN; - } - } - - return $this->addUsingAlias(FeatureCategoryTableMap::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 ChildFeatureCategoryQuery 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(FeatureCategoryTableMap::UPDATED_AT, $updatedAt['min'], Criteria::GREATER_EQUAL); - $useMinMax = true; - } - if (isset($updatedAt['max'])) { - $this->addUsingAlias(FeatureCategoryTableMap::UPDATED_AT, $updatedAt['max'], Criteria::LESS_EQUAL); - $useMinMax = true; - } - if ($useMinMax) { - return $this; - } - if (null === $comparison) { - $comparison = Criteria::IN; - } - } - - return $this->addUsingAlias(FeatureCategoryTableMap::UPDATED_AT, $updatedAt, $comparison); - } - - /** - * Filter the query by a related \Thelia\Model\Category object - * - * @param \Thelia\Model\Category|ObjectCollection $category The related object(s) to use as filter - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL - * - * @return ChildFeatureCategoryQuery The current query, for fluid interface - */ - public function filterByCategory($category, $comparison = null) - { - if ($category instanceof \Thelia\Model\Category) { - return $this - ->addUsingAlias(FeatureCategoryTableMap::CATEGORY_ID, $category->getId(), $comparison); - } elseif ($category instanceof ObjectCollection) { - if (null === $comparison) { - $comparison = Criteria::IN; - } - - return $this - ->addUsingAlias(FeatureCategoryTableMap::CATEGORY_ID, $category->toKeyValue('PrimaryKey', 'Id'), $comparison); - } else { - throw new PropelException('filterByCategory() only accepts arguments of type \Thelia\Model\Category or Collection'); - } - } - - /** - * Adds a JOIN clause to the query using the Category relation - * - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' - * - * @return ChildFeatureCategoryQuery The current query, for fluid interface - */ - public function joinCategory($relationAlias = null, $joinType = Criteria::INNER_JOIN) - { - $tableMap = $this->getTableMap(); - $relationMap = $tableMap->getRelation('Category'); - - // 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, 'Category'); - } - - return $this; - } - - /** - * Use the Category relation Category 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 \Thelia\Model\CategoryQuery A secondary query class using the current class as primary query - */ - public function useCategoryQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN) - { - return $this - ->joinCategory($relationAlias, $joinType) - ->useQuery($relationAlias ? $relationAlias : 'Category', '\Thelia\Model\CategoryQuery'); - } - - /** - * Filter the query by a related \Thelia\Model\Feature object - * - * @param \Thelia\Model\Feature|ObjectCollection $feature The related object(s) to use as filter - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL - * - * @return ChildFeatureCategoryQuery The current query, for fluid interface - */ - public function filterByFeature($feature, $comparison = null) - { - if ($feature instanceof \Thelia\Model\Feature) { - return $this - ->addUsingAlias(FeatureCategoryTableMap::FEATURE_ID, $feature->getId(), $comparison); - } elseif ($feature instanceof ObjectCollection) { - if (null === $comparison) { - $comparison = Criteria::IN; - } - - return $this - ->addUsingAlias(FeatureCategoryTableMap::FEATURE_ID, $feature->toKeyValue('PrimaryKey', 'Id'), $comparison); - } else { - throw new PropelException('filterByFeature() only accepts arguments of type \Thelia\Model\Feature or Collection'); - } - } - - /** - * Adds a JOIN clause to the query using the Feature relation - * - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' - * - * @return ChildFeatureCategoryQuery The current query, for fluid interface - */ - public function joinFeature($relationAlias = null, $joinType = Criteria::INNER_JOIN) - { - $tableMap = $this->getTableMap(); - $relationMap = $tableMap->getRelation('Feature'); - - // 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, 'Feature'); - } - - return $this; - } - - /** - * Use the Feature relation Feature 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 \Thelia\Model\FeatureQuery A secondary query class using the current class as primary query - */ - public function useFeatureQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN) - { - return $this - ->joinFeature($relationAlias, $joinType) - ->useQuery($relationAlias ? $relationAlias : 'Feature', '\Thelia\Model\FeatureQuery'); - } - - /** - * Exclude object from result - * - * @param ChildFeatureCategory $featureCategory Object to remove from the list of results - * - * @return ChildFeatureCategoryQuery The current query, for fluid interface - */ - public function prune($featureCategory = null) - { - if ($featureCategory) { - $this->addUsingAlias(FeatureCategoryTableMap::ID, $featureCategory->getId(), Criteria::NOT_EQUAL); - } - - return $this; - } - - /** - * Deletes all rows from the feature_category 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(FeatureCategoryTableMap::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). - FeatureCategoryTableMap::clearInstancePool(); - FeatureCategoryTableMap::clearRelatedInstancePool(); - - $con->commit(); - } catch (PropelException $e) { - $con->rollBack(); - throw $e; - } - - return $affectedRows; - } - - /** - * Performs a DELETE on the database, given a ChildFeatureCategory or Criteria object OR a primary key value. - * - * @param mixed $values Criteria or ChildFeatureCategory 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(FeatureCategoryTableMap::DATABASE_NAME); - } - - $criteria = $this; - - // Set the correct dbName - $criteria->setDbName(FeatureCategoryTableMap::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(); - - - FeatureCategoryTableMap::removeInstanceFromPool($criteria); - - $affectedRows += ModelCriteria::delete($con); - FeatureCategoryTableMap::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 ChildFeatureCategoryQuery The current query, for fluid interface - */ - public function recentlyUpdated($nbDays = 7) - { - return $this->addUsingAlias(FeatureCategoryTableMap::UPDATED_AT, time() - $nbDays * 24 * 60 * 60, Criteria::GREATER_EQUAL); - } - - /** - * Filter by the latest created - * - * @param int $nbDays Maximum age of in days - * - * @return ChildFeatureCategoryQuery The current query, for fluid interface - */ - public function recentlyCreated($nbDays = 7) - { - return $this->addUsingAlias(FeatureCategoryTableMap::CREATED_AT, time() - $nbDays * 24 * 60 * 60, Criteria::GREATER_EQUAL); - } - - /** - * Order by update date desc - * - * @return ChildFeatureCategoryQuery The current query, for fluid interface - */ - public function lastUpdatedFirst() - { - return $this->addDescendingOrderByColumn(FeatureCategoryTableMap::UPDATED_AT); - } - - /** - * Order by update date asc - * - * @return ChildFeatureCategoryQuery The current query, for fluid interface - */ - public function firstUpdatedFirst() - { - return $this->addAscendingOrderByColumn(FeatureCategoryTableMap::UPDATED_AT); - } - - /** - * Order by create date desc - * - * @return ChildFeatureCategoryQuery The current query, for fluid interface - */ - public function lastCreatedFirst() - { - return $this->addDescendingOrderByColumn(FeatureCategoryTableMap::CREATED_AT); - } - - /** - * Order by create date asc - * - * @return ChildFeatureCategoryQuery The current query, for fluid interface - */ - public function firstCreatedFirst() - { - return $this->addAscendingOrderByColumn(FeatureCategoryTableMap::CREATED_AT); - } - -} // FeatureCategoryQuery diff --git a/core/lib/Thelia/Model/FeatureCategory.php b/core/lib/Thelia/Model/FeatureCategory.php deleted file mode 100755 index 62852f3ee..000000000 --- a/core/lib/Thelia/Model/FeatureCategory.php +++ /dev/null @@ -1,9 +0,0 @@ - Date: Wed, 18 Sep 2013 10:54:22 +0200 Subject: [PATCH 73/74] remove unused classes --- core/lib/Thelia/Model/CouponRule.php | 9 --------- core/lib/Thelia/Model/CouponRuleQuery.php | 20 -------------------- 2 files changed, 29 deletions(-) delete mode 100755 core/lib/Thelia/Model/CouponRule.php delete mode 100755 core/lib/Thelia/Model/CouponRuleQuery.php diff --git a/core/lib/Thelia/Model/CouponRule.php b/core/lib/Thelia/Model/CouponRule.php deleted file mode 100755 index 14c84deb2..000000000 --- a/core/lib/Thelia/Model/CouponRule.php +++ /dev/null @@ -1,9 +0,0 @@ - Date: Wed, 18 Sep 2013 11:07:15 +0200 Subject: [PATCH 74/74] rtrime rewritten url --- core/lib/Thelia/Model/Tools/UrlRewritingTrait.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/lib/Thelia/Model/Tools/UrlRewritingTrait.php b/core/lib/Thelia/Model/Tools/UrlRewritingTrait.php index 1b9087626..182dbcaf3 100644 --- a/core/lib/Thelia/Model/Tools/UrlRewritingTrait.php +++ b/core/lib/Thelia/Model/Tools/UrlRewritingTrait.php @@ -68,7 +68,7 @@ trait UrlRewritingTrait { // Only allow one dash separator at a time (and make string lowercase) $cleanString = mb_strtolower(preg_replace('/--+/u', '-', $string), 'UTF-8'); - $urlFilePart = $cleanString . ".html"; + $urlFilePart = rtrim($cleanString, '.-~_') . ".html"; // TODO : // check if URL url already exists, and add a numeric suffix, or the like