locomotive_ecommerce_plugin 1.0.1 → 1.0.4

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    M2Y4ZTc5NzNjNmFmOTA2ODFlYjIyMjEzYTViZGZkYTMzOWFmZTBmZA==
+    NWU3NmY0NDM0ZTBlZDcyNTJmZDM1NDllNmY1MTc0NGIzNzFkNmE1Ng==
   data.tar.gz: !binary |-
-    MWVhZDVlM2U4ZmQ3MDMwOWQ1ZWIwZGZiOWI3Mzc1YWU3M2E1ZDk1OA==
+    OWJhMTcxMTEyYTAzZTcyZDIyMDI1MTgyZjdhZWIzZmY5ZmM0Y2NjZQ==
 SHA512:
   metadata.gz: !binary |-
-    NGNmMzc5ZGU5ZDQ2ZTI4NGFlMTAzNTg4ZTI1MDQ3YmNhNGJhZWM1N2MxMGQ4
-    OWQ1ZjA5NGQ4ZTMxMDFjY2Y1NmI1M2U5NDY2N2U0MGI5MWFjMmM0NzBkMDcy
-    NjVkNjE3YmE0MzBkMTRjNTRjOTBkYjU3NjMzYjJmZjk1MmM1ODg=
+    ODBlZjBiYzdiYmZmOTkyZTI3NzU4YWZlODZhNTJjNzA0OGMwM2JkZTg3YmUx
+    NTMyMDEyYTE3YWQ3MjUxNTJhZGIxMWNkMWEzNDFmZTVkM2QxOTg3MDhiNjU0
+    MTI2YzA5OTQxNDE1OGMzMmJjZWY5MTQ5YjMyOTI3YWY2Y2Y5M2U=
   data.tar.gz: !binary |-
-    YmI3N2VkNWQzYzk5M2MyYWY0Y2UwZWJhOTBjMTIwOTYyMjlhN2I5YmZlNmRm
-    Zjk3ZGMyYzI1YzlkNzhlMDY2OGU2NzU3OWM2N2U5YjhlNzhiYzhlNDZhMzVm
-    MzM4Y2JhYTAzMGYyNzVlMjU3YjczODRkZGY0OWI1Yzk4NjU3YzY=
+    ZjZmOGM4OTJjNzNkYjQ1OThiODc5NDZjNzg1MDViMjI3YTQ0YjIxNmU2MWEy
+    ODVjYWI5MjU3OWIyZDYzM2JkZjBhNTU2YzYzMjI0MGY3MTE0NmM5YTI0ZDhj
+    ZjkyNTY4YmZmNTBjYzE1YTJmMjZhMTY3MGZmN2E0MzhhNTVjZGI=

data/app/controllers/locomotive/ecommerce/cart_controller.rb

@@ -1,12 +1,12 @@
-module Locomotive	
-	module Ecommerce
-	  class CartController < ::Locomotive::Ecommerce::ApplicationController
-	    def update
-	      @cart = Cart.find(params[:id])
-	      @cart.update_from_params(params)
-	      flash[:success] = 'Updated cart'
-	      redirect_to cart_path
-	    end
-	  end
-	end
-end
+module Locomotive
+  module Ecommerce
+    class CartController < ::Locomotive::Ecommerce::ApplicationController
+      def update
+        @cart = Cart.find(params[:id])
+        @cart.update_from_params(params)
+        flash[:success] = 'Updated cart'
+        redirect_to cart_path
+      end
+    end
+  end
+end

data/app/controllers/locomotive/ecommerce/purchase_controller.rb

@@ -3,7 +3,7 @@ require 'stripe'
 module Locomotive
   module Ecommerce
     class PurchaseController < ::Locomotive::Ecommerce::ApplicationController
-      before_filter :authenticate_user!, except: [:do_new_purchase]
+      before_filter :do_authorize, except: [:do_new_purchase]
 
       def create
         @purchase = current_user_cart(self).purchase
@@ -21,35 +21,12 @@ module Locomotive
         redirect_to checkout_path
       end
 
-      def self.complete(purchase_id, user, cart, stripeToken)
-        purchase = Purchase.where(_id: purchase_id).first
-
-        #Reset user cart
-        purchase.cart.user_id = nil
-        purchase.cart.save!
-        new_cart = Cart.create
-        new_cart.user_id = user.id
-        new_cart.save!
-
-        #complete purchase
-        purchase.stripe_token = stripeToken
-        purchase.complete
-        purchase.completed = true
-        purchase.user_id = user.id
-        purchase.save!
-        PurchaseMailer.purchase_confirmation(user, purchase).deliver
-        after_purchase_hook(purchase, user)
-      end
-
       private
 
-      def self.after_purchase_hook(purchase, user)
-
-        site = Thread.current[:site]
-        cxt = site.plugin_object_for_id('ecommerce').js3_context
-        cxt['user'] = user
-        cxt['purchase'] = purchase
-        last = cxt.eval(Engine.config_or_default('after_purchase_hook'))
+      def do_authorize
+        if Engine.config_or_default('require_user')
+          authenticate_user!
+        end
       end
     end
   end

data/app/helpers/locomotive/ecommerce/ecommerce_cart_helper.rb

@@ -1,11 +1,11 @@
 module Locomotive
-	module Ecommerce
-	  module EcommerceCartHelper
-	    def current_user_cart(controller)
-	      user = current_user(controller)
-	      id = user == nil ? nil : user.id
-	      Cart.find_or_create(id, controller.session)
-	    end
-	  end
-	end
+  module Ecommerce
+    module EcommerceCartHelper
+      def current_user_cart(controller)
+        user = current_user(controller)
+        id = user == nil ? nil : user.id
+        Cart.find_or_create(id, controller.session)
+      end
+    end
+  end
 end

data/app/models/locomotive/ecommerce/cart.rb

@@ -44,7 +44,7 @@ module Locomotive
         ext = Engine.config_or_default('edit_extra')
         return nil unless ext
         site = Thread.current[:site]
-        cxt = site.plugin_object_for_id('inventory').js3_context
+        cxt = site.plugin_object_for_id('ecommerce').js3_context
         cxt['purchase_total'] = purchase_total
         cxt['orders'] = orders
         js = cxt.eval(ext)
@@ -159,4 +159,4 @@ module Locomotive
       attr_accessor :source
     end
   end
-end
+end

data/app/models/locomotive/ecommerce/order.rb

@@ -23,11 +23,11 @@ module Locomotive
       end
 
       def price
-        quantity * product_price(sku).to_i
+        quantity * product_price.to_i
       end
 
       def out_of_stock?
-        quantity > product_quantity(sku)
+        quantity > product_quantity
       end
 
       def self.id_to_sku(id)
@@ -36,14 +36,20 @@ module Locomotive
       end
 
       def product
-        self.class.product_class.find_by_sku(sku)
+        klass = self.class.product_class
+
+        if klass.respond_to?(:find_by_sku)
+          klass.find_by_sku(sku)
+        else
+          klass.where(sku: sku).first
+        end
       end
 
       [:size, :color, :quantity, :price, :name].each do |method|
         defined = "product_#{method}".to_sym
         default = [:quantity, :price].include?(method)? 0 : ''
         method = :description if method == :name
-        define_method(defined) do |sku|
+        define_method(defined) do
           i = product
           if i == nil
             default
@@ -90,18 +96,22 @@ module Locomotive
         "%0.2f" % @source.price.round(2)
       end
 
-      [:size, :color, :quantity, :name].each do |method|
+      def product_price
+        "%0.2f" % @source.product_price.round(2)
+      end
+
+      [:size, :color, :name].each do |method|
         defined = "product_#{method}".to_sym
         define_method(method) do
-          @source.send(defined, @source.sku)
+          @source.send(defined)
         end
-      end 
+      end
 
-      delegate :sku, :product, :out_of_stock?, :product_quantity, :cart, to: :@source
+      delegate :sku, :product, :quantity, :out_of_stock?, :product_quantity, :cart, to: :@source
 
       protected
 
-      attr_accessor :source 
+      attr_accessor :source
     end
   end
-end
+end

data/app/models/locomotive/ecommerce/purchase.rb

@@ -11,6 +11,29 @@ module Locomotive
       field   :stripe_token,    :type => String
       has_one :cart,            :class_name => "::Locomotive::Ecommerce::Cart"
 
+      def self.complete(purchase_id, user, cart, stripeToken, session)
+        purchase = Purchase.where(_id: purchase_id).first
+
+        #Reset user cart
+        purchase.cart.user_id = nil
+        purchase.cart.save!
+        new_cart = Cart.create
+        new_cart.user_id = user.id if user
+        new_cart.save!
+        session[:cart_id] = new_cart.id
+
+        #complete purchase
+        purchase.stripe_token = stripeToken
+        purchase.complete
+        purchase.completed = true
+        purchase.user_id = user.id if user
+        purchase.save!
+        if user
+          PurchaseMailer.purchase_confirmation(user, purchase).deliver
+        end
+        after_purchase_hook(purchase, user)
+      end
+
       def complete
         cart.orders.each { |order| order.product_quantity -= order.quantity }
       end
@@ -43,42 +66,42 @@ module Locomotive
       end
 
       def tax
-        if precent = tax_precentage
+        if precent = tax_percentage
           cart.purchase_total * (precent.to_f/100)
         else
           -1
         end
       end
 
-      def tax_precentage
-        unless @tax_precentage
+      def tax_percentage
+        unless @tax_percentage
           ct = Thread.current[:site].content_types.where(slug: Engine.config_or_default('tax_model')).first
           if ct
             query_hash = {}
             country_field = Engine.config_or_default('country_slug').to_sym
             province_field = Engine.config_or_default('province_slug').to_sym
-            precentage_field = Engine.config_or_default('precentage_slug').to_sym
+            percentage_field = Engine.config_or_default('percentage_slug').to_sym
             query_hash[country_field] = /#{shipping_info[country_field.to_s]}/i
             query = ct.entries.where(query_hash)
             if query.count == 1
-              @tax_precentage = query.first.send(precentage_field)
+              @tax_percentage = query.first.send(percentage_field)
             elsif query.count > 0
               query_hash = {}
               query_hash[province_field] = /#{shipping_info[province_field.to_s]}/i
               query = query.and(query_hash)
               if query.count > 0
-                @tax_precentage = query.first.send(precentage_field)
+                @tax_percentage = query.first.send(percentage_field)
               else
-                @tax_precentage = nil
+                @tax_percentage = nil
               end
             else
-              @tax_precentage = nil
+              @tax_percentage = nil
             end
           else
-            @tax_precentage = nil
+            @tax_percentage = nil
           end
         end
-        @tax_precentage
+        @tax_percentage
       end
 
       def shipping
@@ -92,9 +115,9 @@ module Locomotive
           query_hash = {}
           query_hash[name_field] = self.shipping_method
           method = ct.entries.where(query_hash).first
-          if self.cart.purchase_total > price_break
+          if method && self.cart.purchase_total > price_break
             @shipping = method.send(over_field).to_f
-          else
+          elsif method
             @shipping = method.send(under_field).to_f
           end
         end
@@ -110,6 +133,16 @@ module Locomotive
         end
       end
 
+      protected
+
+      def self.after_purchase_hook(purchase, user)
+
+        site = Thread.current[:site]
+        cxt = site.plugin_object_for_id('ecommerce').js3_context
+        cxt['user'] = user
+        cxt['purchase'] = purchase
+        last = cxt.eval(Engine.config_or_default('after_purchase_hook'))
+      end
     end
 
     class PurchaseDrop < ::Liquid::Drop
@@ -126,9 +159,9 @@ module Locomotive
       end
 
       [:subtotal_est_tax, :shipping_estimate, :subtotal_est_shipping,
-        :shipping, :tax, :tax_precentage, :total].each do |method|
+        :shipping, :tax, :tax_percentage, :total].each do |method|
         define_method("#{method.to_s}_value".to_sym) {@source.send(method).round(2)}
-        define_method(method) {"%0.2f" % @source.send(method).round(2)}
+        define_method(method) {"%0.2f" % @source.send(method).round(2) if @source.send(method)}
         end
 
       delegate :cart, :stripe_token, :completed, :shipping_info, to: :@source
@@ -145,4 +178,4 @@ module Locomotive
       attr_accessor :source
     end
   end
-end
+end

data/config/initializers/stripe_setup.rb

@@ -24,10 +24,11 @@ module Locomotive
 
       success_proc = lambda do |controller, token, stripe|
         purchase = Purchase.where(_id: token).first
-        PurchaseController.complete(token,
-                                    helper.current_user(controller),
-                                    helper.current_user_cart(controller),
-                                    stripe)
+        Purchase.complete(token,
+          helper.current_user(controller),
+          helper.current_user_cart(controller),
+          stripe,
+          controller.session)
         controller.flash[:notice] = "Thank you for your purchase."
         helper.post_checkout_path
       end
@@ -37,4 +38,4 @@ module Locomotive
       config.charge_success = success_proc
     end
   end
-end
+end

data/lib/locomotive/ecommerce/plugin/config.html

@@ -16,6 +16,11 @@
   <input type="text" name="checkout_url" />
 </li>
 
+<li>
+  <label name="confirm_order_url">Confirm Order URL:</label>
+  <input type="text" name="confirm_order_url" />
+</li>
+
 <li>
   <label name="new_checkout_url">Post Checkout URL:</label>
   <input type="text" name="post_checkout_url" />
@@ -24,10 +29,6 @@
   <label name="purchases_url">Purchases URL:</label>
   <input type="text" name="purchases_url" />
 </li>
-<li>
-  <label name="with_quantity">Only in Stock Items:</label>
-  <input type="checkbox" name="with_quantity" />
-</li>
 <li>
   <label name="purchases_url">Estimated Tax Rate (in percent):</label>
   <input type="text" name="estimated_tax_rate" />
@@ -51,8 +52,8 @@
   <input type="text" name="province_slug" />
 </li>
 <li>
-  <label name="precentage_slug">Precentage Slug:</label>
-  <input type="text" name="precentage_slug" />
+  <label name="percentage_slug">Precentage Slug:</label>
+  <input type="text" name="percentage_slug" />
 </li>
 <li>
   <label name="shipping_model">Shipping Model:</label>
@@ -109,3 +110,7 @@
   <label name="contact">Contact</label>
   <input type="text" name="contact" />
 </li>
+<li>
+  <label name="require_user">Require User?</label>
+  <input type="checkbox" name="require_user" />
+</li>

data/lib/locomotive/ecommerce/plugin/ecommerce_filters.rb

@@ -7,9 +7,9 @@ module Locomotive
         "#{stem}cart/#{cart.id}"
       end
 
-      def add_to_cart_path(product)
+      def add_to_cart_path(product_sku)
         stem = @context.registers[:plugin_object].path
-        "#{stem}add_to_cart/#{product.id}"
+        "#{stem}add_to_cart/#{product_sku}"
       end
 
       def remove_from_cart_path(product_sku)

data/lib/locomotive/ecommerce/plugin/ecommerce_tags.rb

@@ -12,10 +12,12 @@ module Locomotive
         super
         session = context.registers[:controller].session
         site = Thread.current[:site]
-        user_from_plugin = site.plugin_object_for_id('identity_plugin').js3_context['identity_plugin_users']
-        user = user_from_plugin.find(session[:user_id])
-        # user = IdentityPlugin::User.find(session[:user_id])
-        id = user == nil ? nil : user.id
+        id = nil
+        if session[:user_id]
+          user_from_plugin = site.plugin_object_for_id('identity_plugin').js3_context['identity_plugin_users']
+          user = user_from_plugin.find(session[:user_id])
+          id = user == nil ? nil : user.id
+        end
         cart = Cart.find_or_create(id, session)
         @purchase = cart.purchase
         context.registers[:controller].render_cell 'stripe_helper/stripe', :show,
@@ -28,4 +30,4 @@ module Locomotive
       end
     end
   end
-end
+end

data/lib/locomotive/ecommerce/plugin/engine.rb

@@ -24,15 +24,15 @@ module Locomotive
           'estimated_tax_rate' => '15',
           'country_slug' => 'country',
           'province_slug' => 'province',
-          'precentage_slug' => 'precentage',
+          'percentage_slug' => 'percentage',
           'shipping_name_slug' => 'name',
           'shipping_over_slug' => 'over',
           'shipping_under_slug' => 'under',
           'price_break' => '100',
-          'edit_extra' => 'add extras through JS',
           'shop_name' => "<insert name>",
           'shop_inventory' => "inventory_itemsUpdate",
-          'contact' => "fake@email.com"
+          'contact' => "fake@email.com",
+          'require_user' => false
         }
         hash = defaults.merge(config_hash)
         hash[key]

data/lib/locomotive/ecommerce/plugin/inventory_interface.rb

@@ -2,21 +2,21 @@ module Locomotive
   module Ecommerce
     module InventoryInterface
       # Inventory
-		def self.included(base)
-			base.send :extend, Methods
-			base.send :include, Methods
-		end
-	    module Methods
+      def self.included(base)
+        base.send :extend, Methods
+        base.send :include, Methods
+      end
+      module Methods
 
-			def inventory_items
-				site = Thread.current[:site]
-				site.plugin_object_for_id('inventory').js3_context.eval(Engine.config_or_default('shop_inventory_update'))
-			end
-			def inventory_items_class
-				site = Thread.current[:site]
-				site.plugin_object_for_id('inventory').js3_context.eval(Engine.config_or_default('shop_inventory_items'))
-			end
-		end
+        def inventory_items
+          site = Thread.current[:site]
+          site.plugin_object_for_id('ecommerce').js3_context.eval(Engine.config_or_default('shop_inventory_update'))
+        end
+        def inventory_items_class
+          site = Thread.current[:site]
+          site.plugin_object_for_id('ecommerce').js3_context.eval(Engine.config_or_default('shop_inventory_items'))
+        end
+      end
     end
   end
-end 
+end

data/lib/locomotive/ecommerce/plugin/version.rb

@@ -1,5 +1,5 @@
 module Locomotive
   module Ecommerce
-    VERSION = "1.0.1"
+    VERSION = "1.0.4"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: locomotive_ecommerce_plugin
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.4
 platform: ruby
 authors:
 - Colibri Software
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-16 00:00:00.000000000 Z
+date: 2014-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails