namespace stuff

controllers/single_page/dashboard/store/products.php

@@ -300,9 +300,9 @@ public function save()
 
 
                 if ($data['pID']) {
-                    $this->redirect('/dashboard/store/products/edit/' . $product->getProductID(), 'updated');
+                    $this->redirect('/dashboard/store/products/', 'updated');
                 } else {
-                    $this->redirect('/dashboard/store/products/edit/' . $product->getProductID(), 'success');
+                    $this->redirect('/dashboard/store/products/', 'success');
                 }
             }//if no errors
         }//if post

src/Attribute/Key/StoreOrderKey.php

@@ -1,5 +1,5 @@
 <?php
-namespace Concrete\Package\VividStore\src\Attribute\Key;
+namespace Concrete\Package\VividStore\Src\Attribute\Key;
 
 use Database;
 use \Concrete\Core\Attribute\Value\ValueList as AttributeValueList;

src/Attribute/Key/StoreProductKey.php

@@ -1,5 +1,5 @@
 <?php
-namespace Concrete\Package\VividStore\src\Attribute\Key;
+namespace Concrete\Package\VividStore\Src\Attribute\Key;
 
 use Database;
 use \Concrete\Core\Attribute\Value\ValueList as AttributeValueList;

src/Attribute/Value/StoreOrderValue.php

@@ -1,5 +1,5 @@
 <?php
-namespace Concrete\Package\VividStore\src\Attribute\Value;
+namespace Concrete\Package\VividStore\Src\Attribute\Value;
 
 use Database;
 use \Concrete\Core\Attribute\Value\Value as Value;

src/Attribute/Value/StoreProductValue.php

@@ -1,5 +1,5 @@
 <?php
-namespace Concrete\Package\VividStore\src\Attribute\Value;
+namespace Concrete\Package\VividStore\Src\Attribute\Value;
 
 use Database;
 use \Concrete\Core\Attribute\Value\Value as Value;

src/VividStore/Cart/Cart.php

@@ -1,13 +1,13 @@
 <?php
-namespace Concrete\Package\VividStore\src\VividStore\Cart;
+namespace Concrete\Package\VividStore\Src\VividStore\Cart;
 
 use Session;
 use Database;
 use \Concrete\Package\VividStore\Src\VividStore\Product\Product as StoreProduct;
 use \Concrete\Package\VividStore\Src\VividStore\Shipping\ShippingMethod as StoreShippingMethod;
 use \Concrete\Package\VividStore\Src\VividStore\Product\ProductVariation\ProductVariation as StoreProductVariation;
+use \Concrete\Package\VividStore\Src\VividStore\Utilities\Calculator as StoreCalculator;
 
-defined('C5_EXECUTE') or die(_("Access Denied."));
 class Cart
 {
     protected static $cart = null;
@@ -363,4 +363,9 @@ public function createsAccount()
 
         return false;
     }
+    //deprecated
+    public function getTotal()
+    {
+        return StoreCalculator::getGrandTotal();
+    }
 }

src/VividStore/Cart/CartModal.php

@@ -1,5 +1,5 @@
 <?php 
-namespace Concrete\Package\VividStore\src\VividStore\Cart;
+namespace Concrete\Package\VividStore\Src\VividStore\Cart;
 
 use \Concrete\Core\Controller\Controller as RouteController;
 use View;

src/VividStore/Cart/CartTotal.php

@@ -1,5 +1,5 @@
 <?php 
-namespace Concrete\Package\VividStore\src\VividStore\Cart;
+namespace Concrete\Package\VividStore\Src\VividStore\Cart;
 
 use \Concrete\Core\Controller\Controller as RouteController;
 use \Concrete\Package\VividStore\Src\VividStore\Utilities\Price as StorePrice;

src/VividStore/Customer/Customer.php

@@ -1,5 +1,5 @@
 <?php
-namespace Concrete\Package\VividStore\src\VividStore\Customer;
+namespace Concrete\Package\VividStore\Src\VividStore\Customer;
 
 use Session;
 use User;

src/VividStore/Group/Group.php

@@ -1,5 +1,5 @@
 <?php 
-namespace Concrete\Package\VividStore\src\VividStore\Group;
+namespace Concrete\Package\VividStore\Src\VividStore\Group;
 
 use Database;
 

src/VividStore/Group/GroupList.php

@@ -1,16 +1,13 @@
 <?php 
-namespace Concrete\Package\VividStore\src\VividStore\Group;
+namespace Concrete\Package\VividStore\Src\VividStore\Group;
 
 use Database;
 
 class GroupList
 {
     public static function getGroupList()
     {
-        $queryBuilder = Database::get()->getEntityManager()->createQueryBuilder();
-        return $queryBuilder->select('g')
-            ->from('\Concrete\Package\VividStore\Src\VividStore\Group\Group', 'g')
-            ->getQuery()
-            ->getResult();
+        $em = Database::get()->getEntityManager();
+        return $em->createQuery('select g from \Concrete\Package\VividStore\Src\VividStore\Group\Group g')->getResult();
     }
 }

src/VividStore/Order/Order.php

@@ -1,5 +1,5 @@
 <?php 
-namespace Concrete\Package\VividStore\src\VividStore\Order;
+namespace Concrete\Package\VividStore\Src\VividStore\Order;
 
 use Database;
 use User;

src/VividStore/Order/OrderDiscount.php

@@ -1,5 +1,5 @@
 <?php
-namespace Concrete\Package\VividStore\src\VividStore\Order;
+namespace Concrete\Package\VividStore\Src\VividStore\Order;
 
 
 /**

src/VividStore/Order/OrderEvent.php

@@ -1,5 +1,5 @@
 <?php
-namespace Concrete\Package\VividStore\src\VividStore\Order;
+namespace Concrete\Package\VividStore\Src\VividStore\Order;
 
 use \Symfony\Component\EventDispatcher\GenericEvent;
 

src/VividStore/Order/OrderItem.php

@@ -1,5 +1,5 @@
 <?php 
-namespace Concrete\Package\VividStore\src\VividStore\Order;
+namespace Concrete\Package\VividStore\Src\VividStore\Order;
 
 use Database;
 use Concrete\Package\VividStore\Src\VividStore\Order\Order as StoreOrder;

src/VividStore/Order/OrderItemOption.php

@@ -1,5 +1,5 @@
 <?php
-namespace Concrete\Package\VividStore\src\VividStore\Order;
+namespace Concrete\Package\VividStore\Src\VividStore\Order;
 
 
 /**

src/VividStore/Order/OrderList.php

@@ -1,5 +1,5 @@
 <?php 
-namespace Concrete\Package\VividStore\src\VividStore\Order;
+namespace Concrete\Package\VividStore\Src\VividStore\Order;
 
 use Database;
 use Concrete\Core\Search\Pagination\Pagination;

src/VividStore/Order/OrderStatus/OrderStatus.php

@@ -1,5 +1,5 @@
 <?php
-namespace Concrete\Package\VividStore\src\VividStore\Order\OrderStatus;
+namespace Concrete\Package\VividStore\Src\VividStore\Order\OrderStatus;
 
 use \Concrete\Core\Utility\Service\Text as TextHelper;
 use Database;

src/VividStore/Order/OrderStatus/OrderStatusHistory.php

@@ -1,5 +1,5 @@
 <?php
-namespace Concrete\Package\VividStore\src\VividStore\Order\OrderStatus;
+namespace Concrete\Package\VividStore\Src\VividStore\Order\OrderStatus;
 
 use Database;
 use Events;

src/VividStore/Payment/Method.php

@@ -1,5 +1,5 @@
 <?php 
-namespace Concrete\Package\VividStore\src\VividStore\Payment;
+namespace Concrete\Package\VividStore\Src\VividStore\Payment;
 
 use Concrete\Core\Foundation\Object as Object;
 use Database;

src/VividStore/Payment/Methods/AuthNet/AuthNetPaymentMethod.php

@@ -1,5 +1,5 @@
 <?php
-namespace Concrete\Package\VividStore\src\VividStore\Payment\Methods\AuthNet;
+namespace Concrete\Package\VividStore\Src\VividStore\Payment\Methods\AuthNet;
 
 use Core;
 use Config;

src/VividStore/Payment/Methods/Invoice/InvoicePaymentMethod.php

@@ -1,5 +1,5 @@
 <?php
-namespace Concrete\Package\VividStore\src\VividStore\Payment\Methods\Invoice;
+namespace Concrete\Package\VividStore\Src\VividStore\Payment\Methods\Invoice;
 
 use Core;
 use Config;

src/VividStore/Payment/Methods/PaypalStandard/PaypalStandardPaymentMethod.php

@@ -1,5 +1,5 @@
 <?php
-namespace Concrete\Package\VividStore\src\VividStore\Payment\Methods\PaypalStandard;
+namespace Concrete\Package\VividStore\Src\VividStore\Payment\Methods\PaypalStandard;
 
 use Core;
 use URL;

src/VividStore/Product/Product.php

@@ -1,5 +1,5 @@
 <?php
-namespace Concrete\Package\VividStore\src\VividStore\Product;
+namespace Concrete\Package\VividStore\Src\VividStore\Product;
 
 use Package;
 use Page;

src/VividStore/Product/ProductFile.php

@@ -1,5 +1,5 @@
 <?php 
-namespace Concrete\Package\VividStore\src\VividStore\Product;
+namespace Concrete\Package\VividStore\Src\VividStore\Product;
 
 use Database;
 use \Concrete\Package\VividStore\Src\VividStore\Product\Product as StoreProduct;
@@ -76,21 +76,23 @@ public static function addFilesForProduct(array $files, StoreProduct $product)
     {
         self::removeFilesForProduct($product);
         //add new ones.
-        foreach ($files['dffID'] as $fileID) {
-            if (!empty($fileID) && $fileID > 0) {
-                self::add($product->getProductID(), $fileID);
-                $fileObj = \File::getByID($fileID);
-                $fs = \FileSet::getByName("Digital Downloads");
-                $fs->addFileToSet($fileObj);
-                $fileObj->resetPermissions(1);
-                $pk = \Concrete\Core\Permission\Key\FileKey::getByHandle('view_file');
-                $pk->setPermissionObject($fileObj);
-                $pao = $pk->getPermissionAssignmentObject();
-                $groupEntity = \Concrete\Core\Permission\Access\Entity\GroupEntity::getOrCreate(\Group::getByID(GUEST_GROUP_ID));
-                $pa = $pk->getPermissionAccessObject();
-                if ($pa) {
-                    $pa->removeListItem($groupEntity);
-                    $pao->assignPermissionAccess($pa);
+        if(!empty($files['dffID'])) {
+            foreach ($files['dffID'] as $fileID) {
+                if (!empty($fileID) && $fileID > 0) {
+                    self::add($product->getProductID(), $fileID);
+                    $fileObj = \File::getByID($fileID);
+                    $fs = \FileSet::getByName("Digital Downloads");
+                    $fs->addFileToSet($fileObj);
+                    $fileObj->resetPermissions(1);
+                    $pk = \Concrete\Core\Permission\Key\FileKey::getByHandle('view_file');
+                    $pk->setPermissionObject($fileObj);
+                    $pao = $pk->getPermissionAssignmentObject();
+                    $groupEntity = \Concrete\Core\Permission\Access\Entity\GroupEntity::getOrCreate(\Group::getByID(GUEST_GROUP_ID));
+                    $pa = $pk->getPermissionAccessObject();
+                    if ($pa) {
+                        $pa->removeListItem($groupEntity);
+                        $pao->assignPermissionAccess($pa);
+                    }
                 }
             }
         }

src/VividStore/Product/ProductGroup.php

@@ -1,5 +1,5 @@
 <?php 
-namespace Concrete\Package\VividStore\src\VividStore\Product;
+namespace Concrete\Package\VividStore\Src\VividStore\Product;
 
 use Database;
 use \Concrete\Package\VividStore\Src\VividStore\Group as StoreGroup;

src/VividStore/Product/ProductImage.php

@@ -1,5 +1,5 @@
 <?php 
-namespace Concrete\Package\VividStore\src\VividStore\Product;
+namespace Concrete\Package\VividStore\Src\VividStore\Product;
 
 use Database;
 use File;

src/VividStore/Product/ProductList.php

@@ -1,5 +1,5 @@
 <?php 
-namespace Concrete\Package\VividStore\src\VividStore\Product;
+namespace Concrete\Package\VividStore\Src\VividStore\Product;
 
 use Concrete\Core\Search\Pagination\Pagination;
 use Concrete\Core\Search\ItemList\Database\AttributedItemList;

src/VividStore/Product/ProductLocation.php

@@ -1,5 +1,5 @@
 <?php 
-namespace Concrete\Package\VividStore\src\VividStore\Product;
+namespace Concrete\Package\VividStore\Src\VividStore\Product;
 
 use Database;
 use \Concrete\Package\VividStore\Src\VividStore\Product\Product as StoreProduct;
@@ -69,7 +69,9 @@ public static function addLocationsForProduct(array $locations, StoreProduct $pr
         //add new ones.
         if (!empty($locations['cID'])) {
             foreach ($locations['cID'] as $cID) {
-                self::add($product->getProductID(), $cID);
+                if($cID>0) {
+                    self::add($product->getProductID(), $cID);
+                }
             }
         }
     }

src/VividStore/Product/ProductModal.php

@@ -1,5 +1,5 @@
 <?php 
-namespace Concrete\Package\VividStore\src\VividStore\Product;
+namespace Concrete\Package\VividStore\Src\VividStore\Product;
 
 use \Concrete\Core\Controller\Controller;
 use View;

src/VividStore/Product/ProductOption/ProductOption.php

@@ -1,5 +1,5 @@
 <?php
-namespace Concrete\Package\VividStore\src\VividStore\Product\ProductOption;
+namespace Concrete\Package\VividStore\Src\VividStore\Product\ProductOption;
 
 use \Concrete\Package\VividStore\Src\VividStore\Product\ProductOption\ProductOptionGroup as StoreProductOptionGroup;
 use \Concrete\Package\VividStore\Src\VividStore\Product\ProductOption\ProductOptionItem as StoreProductOptionItem;

src/VividStore/Product/ProductOption/ProductOptionGroup.php

@@ -1,5 +1,5 @@
 <?php 
-namespace Concrete\Package\VividStore\src\VividStore\Product\ProductOption;
+namespace Concrete\Package\VividStore\Src\VividStore\Product\ProductOption;
 
 use Database;
 use \Concrete\Package\VividStore\Src\VividStore\Product\Product as StoreProduct;

src/VividStore/Product/ProductOption/ProductOptionItem.php

@@ -1,5 +1,5 @@
 <?php 
-namespace Concrete\Package\VividStore\src\VividStore\Product\ProductOption;
+namespace Concrete\Package\VividStore\Src\VividStore\Product\ProductOption;
 
 use Database;
 use \Concrete\Package\VividStore\Src\VividStore\Product\Product as StoreProduct;

src/VividStore/Product/ProductUserGroup.php

@@ -1,5 +1,5 @@
 <?php 
-namespace Concrete\Package\VividStore\src\VividStore\Product;
+namespace Concrete\Package\VividStore\Src\VividStore\Product;
 
 use Database;
 use \Concrete\Package\VividStore\Src\VividStore\Product\Product as StoreProduct;

src/VividStore/Product/ProductVariation/ProductVariation.php

@@ -1,5 +1,5 @@
 <?php
-namespace Concrete\Package\VividStore\src\VividStore\Product\ProductVariation;
+namespace Concrete\Package\VividStore\Src\VividStore\Product\ProductVariation;
 
 use \Concrete\Package\VividStore\Src\VividStore\Product\Product as StoreProduct;
 use \Concrete\Package\VividStore\Src\VividStore\Product\ProductVariation\ProductVariationOptionItem as StoreProductVariationOptionItem;

src/VividStore/Product/ProductVariation/ProductVariationOptionItem.php

@@ -1,5 +1,5 @@
 <?php
-namespace Concrete\Package\VividStore\src\VividStore\Product\ProductVariation;
+namespace Concrete\Package\VividStore\Src\VividStore\Product\ProductVariation;
 
 use Database;
 

src/VividStore/Promotion/Promotion.php

@@ -1,5 +1,5 @@
 <?php
-namespace Concrete\Package\VividStore\src\VividStore\Promotion;
+namespace Concrete\Package\VividStore\Src\VividStore\Promotion;
 
 
 /**

src/VividStore/Promotion/PromotionReward.php

@@ -1,5 +1,5 @@
 <?php
-namespace Concrete\Package\VividStore\src\VividStore\Promotion;
+namespace Concrete\Package\VividStore\Src\VividStore\Promotion;
 
 use Database;
 

src/VividStore/Promotion/PromotionRewardType.php

@@ -1,5 +1,5 @@
 <?php
-namespace Concrete\Package\VividStore\src\VividStore\Promotion;
+namespace Concrete\Package\VividStore\Src\VividStore\Promotion;
 
 use Database;
 use Core;

src/VividStore/Promotion/PromotionRewardTypeReward.php

@@ -1,5 +1,5 @@
 <?php
-namespace Concrete\Package\VividStore\src\VividStore\Promotion;
+namespace Concrete\Package\VividStore\Src\VividStore\Promotion;
 
 use Database;
 use Controller;

src/VividStore/Promotion/PromotionRewards/DiscountPromotionReward.php

@@ -1,5 +1,5 @@
 <?php
-namespace Concrete\Package\VividStore\src\VividStore\Promotion\PromotionRewards;
+namespace Concrete\Package\VividStore\Src\VividStore\Promotion\PromotionRewards;
 
 use Database;
 use Core;

src/VividStore/Promotion/PromotionRewards/FreeProductPromotionReward.php

@@ -1,5 +1,5 @@
 <?php
-namespace Concrete\Package\VividStore\src\VividStore\Promotion\PromotionRewards;
+namespace Concrete\Package\VividStore\Src\VividStore\Promotion\PromotionRewards;
 
 use Database;
 use Core;

src/VividStore/Promotion/PromotionRule.php

@@ -1,5 +1,5 @@
 <?php
-namespace Concrete\Package\VividStore\src\VividStore\Promotion;
+namespace Concrete\Package\VividStore\Src\VividStore\Promotion;
 
 use Database;
 

src/VividStore/Promotion/PromotionRuleType.php

@@ -1,5 +1,5 @@
 <?php
-namespace Concrete\Package\VividStore\src\VividStore\Promotion;
+namespace Concrete\Package\VividStore\Src\VividStore\Promotion;
 
 use Database;
 use Core;