radiant-shop-extension 0.92.3 → 0.92.6

data/VERSION

@@ -1 +1 @@
-0.92.3
+0.92.6

data/lib/shop/controllers/application_controller.rb

@@ -11,21 +11,22 @@ module Shop
           end
           
           def find_shop_order
-            begin
-              ShopOrder.find_by_session(request.session[:shop_order])
-            rescue
-              nil
-            end
+            ShopOrder.find_by_session(request.session[:shop_order])
           end
           
           def find_or_create_shop_order
-            if find_shop_order
-              return find_shop_order
-            else
-              shop_order = ShopOrder.create(:customer_id => (current_user.id rescue nil))
-              request.session[:shop_order] = shop_order.id
-              return shop_order
+            begin
+              @order = find_shop_order
+            rescue
+              @order = ShopOrder.create
+              request.session[:shop_order] = @order.id
+            end
+            
+            if current_user
+              @order.update_attribute(:customer_id, (current_user.id))
             end
+            
+            @order
           end
         end
       end

data/lib/shop/models/form_extension.rb

@@ -6,25 +6,23 @@ module Shop
         base.class_eval do
           # Uses the page session data to find the current order
           def find_current_order
-            @order  = ShopOrder.find(@page.request.session[:shop_order])
-            @order.update_attribute(:customer_id, (current_customer.id rescue nil)) # either assign it to a user, or don't
+            ShopOrder.find_by_session(@page.request.session[:shop_order])
           end
-
+          
           # Uses the page session data to find or create the current order
           def find_or_create_current_order
             begin
-              find_current_order
+              @order = find_current_order
             rescue
               @order = ShopOrder.create
               @result[:session] = { :shop_order => @order.id }
-              @order.update_attribute(:customer_id, (current_customer.id rescue nil)) # either assign it to a user, or don't
             end
-          end
-          
-          # Returns the current logged in ShopCustomer (if it exists)
-          def current_customer
-            return @shop_customer if @shop_customer.present?
-            @shop_customer = current_user if current_user.present?
+            
+            if current_user
+              @order.update_attribute(:customer_id, (current_user.id))
+            end
+            
+            @order
           end
         end
       end

data/radiant-shop-extension.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{radiant-shop-extension}
-  s.version = "0.92.3"
+  s.version = "0.92.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Dirk Kelly", "John Barker", "Darcy Laycock"]

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: radiant-shop-extension
 version: !ruby/object:Gem::Version 
-  hash: 361
+  hash: 355
   prerelease: false
   segments: 
   - 0
   - 92
-  - 3
-  version: 0.92.3
+  - 6
+  version: 0.92.6
 platform: ruby
 authors: 
 - Dirk Kelly