stall 0.1.1 → 0.1.2

data/app/models/stall/models/shipment.rb

@@ -0,0 +1,29 @@
+module Stall
+  module Models
+    module Shipment
+      extend ActiveSupport::Concern
+
+      included do
+        self.table_name = 'stall_shipments'
+
+        include Stall::Priceable
+
+        belongs_to :cart
+        belongs_to :shipping_method
+
+        store_accessor :data, :tracking_code
+
+        monetize :eot_price_cents, :price_cents,
+                 with_model_currency: :currency, allow_nil: true
+
+        enum state: { pending: 0, shipped: 1 }
+
+        validates :cart, :shipping_method, presence: true
+      end
+
+      def currency
+        cart.try(:currency) || Money.default_currency
+      end
+    end
+  end
+end

data/app/models/stall/models/shipping_method.rb

@@ -0,0 +1,16 @@
+module Stall
+  module Models
+    module ShippingMethod
+      extend ActiveSupport::Concern
+
+      included do
+        self.table_name = 'stall_shipping_methods'
+
+        has_many :shipments, dependent: :nullify
+
+        scope :ordered, -> { order('stall_shipping_methods.name ASC') }
+        scope :active, -> { where(active: true) }
+      end
+    end
+  end
+end

data/app/services/stall/add_to_cart_service.rb

@@ -14,7 +14,13 @@ module Stall
         cart.line_items << line_item
       end
 
-      cart.save
+      cart.save.tap do |saved|
+        return false unless saved
+
+        # Recalculate shipping fee if available for calculation to ensure
+        # that the fee us always up to date when displayed to the customer
+        shipping_fee_service.call if shipping_fee_service.available?
+      end
     end
 
     def line_item
@@ -48,5 +54,9 @@ module Stall
     def sellable_class
       @sellable_class ||= params[:sellable_type].camelize.constantize
     end
+
+    def shipping_fee_service
+      @shipping_fee_service ||= Stall::ShippingFeeCalculatorService.new(cart)
+    end
   end
 end

data/app/services/stall/cart_update_service.rb

@@ -0,0 +1,26 @@
+module Stall
+  class CartUpdateService < Stall::BaseService
+    attr_reader :cart, :params
+
+    def initialize(cart, params)
+      @cart = cart
+      @params = params
+    end
+
+    def call
+      cart.update(params).tap do |saved|
+        return false unless saved
+
+        # Recalculate shipping fee if available for calculation to ensure
+        # that the fee us always up to date when displayed to the customer
+        shipping_fee_service.call if shipping_fee_service.available?
+      end
+    end
+
+    private
+
+    def shipping_fee_service
+      @shipping_fee_service ||= Stall::ShippingFeeCalculatorService.new(cart)
+    end
+  end
+end

data/app/services/stall/payment_notification_service.rb

@@ -1,31 +1,45 @@
 module Stall
   class PaymentNotificationService < Stall::BaseService
-    attr_reader :request
+    class UnknownNotificationError < StandardError; end
 
-    def initialize(request)
+    attr_reader :gateway_identifier, :request
+
+    def initialize(gateway_identifier, request)
+      @gateway_identifier = gateway_identifier
       @request = request
     end
 
     def call
-      gateway.process_payment_for(request)
+      if gateway_response.valid?
+        send_payment_notification_emails! if gateway_response.notify
+      else
+        raise UnknownNotificationError,
+              "The payment notification request does not seem to come from " +
+              "the \"#{ gateway_identifier }\" gateway."
+      end
     end
 
     def rendering_options
-      gateway.rendering_options
+      gateway_response.rendering_options
     end
 
     private
 
-    def gateway
-      @gateway ||= gateway_class.new(cart)
+    def cart
+      gateway_response.cart
     end
 
     def gateway_class
-      @gateway_class ||= Stall::Payments.gateways[request.params[:gateway]]
+      @gateway_class ||= Stall::Payments.gateways[gateway_identifier]
     end
 
-    def cart
-      @cart ||= Stall::Cart.find(gateway_class.cart_id_from(request))
+    def gateway_response
+      @gateway_response ||= gateway_class.response(request)
+    end
+
+    def send_payment_notification_emails!
+      Stall::CustomerMailer.order_paid_email(gateway_response.cart).deliver
+      Stall::AdminMailer.order_paid_email(gateway_response.cart).deliver
     end
   end
 end

data/app/services/stall/shipping_fee_calculator_service.rb

@@ -10,12 +10,23 @@ module Stall
       return unless cart.shipment && cart.shipment.shipping_method
 
       calculator_identifier = cart.shipment.shipping_method.identifier
-      calculator_class = Stall::Shipping.calculators[calculator_identifier]
+      calculator_class = Stall::Shipping::Calculator.for(calculator_identifier)
 
       if calculator_class
         calculator = calculator_class.new(cart, cart.shipment.shipping_method)
-        cart.shipment.update_attributes(price: calculator.price)
+
+        cart.shipment.update_attributes(
+          price: calculator.price,
+          eot_price: calculator.eot_price,
+          vat_rate: calculator.vat_rate
+        )
       end
     end
+
+    def available?
+      cart.line_items.length > 0 &&
+      cart.try(:shipping_address) &&
+      cart.try(:shipment).try(:shipping_method)
+    end
   end
 end

data/app/views/checkout/steps/_informations.html.haml

@@ -1,6 +1,6 @@
 %h1= t('stall.checkout.informations.title')
 
-= simple_form_for cart, as: :cart, url: step_path(cart) do |form|
+= simple_form_for cart, as: :cart, url: step_path do |form|
   = form.fields_for :customer do |customer_form|
     = customer_form.input :email
 
@@ -9,7 +9,7 @@
       = ownership_form.hidden_field :shipping
 
       = ownership_form.fields_for :address do |address_form|
-        = address_form.input :civility
+        = address_form.input :civility, collection: Address.civility_enum
         = address_form.input :first_name
         = address_form.input :last_name
         = address_form.input :address
@@ -27,7 +27,7 @@
       = ownership_form.hidden_field :billing
 
       = ownership_form.fields_for :address do |address_form|
-        = address_form.input :civility
+        = address_form.input :civility, collection: Address.civility_enum
         = address_form.input :first_name
         = address_form.input :last_name
         = address_form.input :address

data/app/views/checkout/steps/_payment.html.haml

@@ -3,10 +3,10 @@
 %table.table.table-striped
   %thead
     %tr
-      %th= Stall::LineItem.human_attribute_name(:name)
-      %th= Stall::LineItem.human_attribute_name(:unit_price)
-      %th= Stall::LineItem.human_attribute_name(:quantity)
-      %th= Stall::LineItem.human_attribute_name(:price)
+      %th= LineItem.human_attribute_name(:name)
+      %th= LineItem.human_attribute_name(:unit_price)
+      %th= LineItem.human_attribute_name(:quantity)
+      %th= LineItem.human_attribute_name(:price)
   %tbody
     - cart.line_items.each do |line_item|
       %tr{ data: { :'line-item-id' => line_item.id } }
@@ -15,6 +15,25 @@
         %td= line_item.quantity
         %td= number_to_currency(line_item.price)
 
+    - if cart.subtotal != cart.total_price
+      %tr
+        %td{ colspan: 3 }= t('stall.carts.recap.subtotal')
+        %td= number_to_currency(cart.subtotal)
+
+    - if cart.shipment && cart.shipment
+      %tr
+        %td{ colspan: 3 }
+          = t('stall.carts.recap.total_shipment_price')
+          \:
+          = cart.shipment.shipping_method.name
+
+        %td= number_to_currency(cart.shipment.price)
+
+    - cart.adjustments.each do |adjustment|
+      %tr
+        %td{ colspan: 3 }= adjustment.name
+        %td= number_to_currency(adjustment.price)
+
     %tr
       %td{ colspan: 3 }= t('stall.carts.recap.total_eot_price')
       %td= number_to_currency(cart.total_eot_price)
@@ -26,3 +45,5 @@
     %tr
       %td{ colspan: 3 }= t('stall.carts.recap.total_price')
       %td= number_to_currency(cart.total_price)
+
+= payment_button_for(cart)

data/app/views/checkout/steps/_payment_method.html.haml

@@ -2,10 +2,8 @@
 
 = simple_form_for cart, as: :cart, url: step_path(cart) do |form|
   = form.fields_for :payment do |payment_fields|
-    = payment_fields.association :payment_method, as: :radio_buttons
+    = payment_fields.association :payment_method, as: :radio_buttons, collection: PaymentMethod.active.ordered
 
   .form-actions
     %button.btn.btn-primary{ type: 'submit' }
       = t('stall.checkout.payment_method.validate')
-
-

data/app/views/checkout/steps/_payment_return.html.haml

@@ -0,0 +1,6 @@
+%h1= t('stall.checkout.payment_return.title')
+
+%p.help-block= t('stall.checkout.payment_return.help').html_safe
+
+= link_to root_path, class: 'btn btn-primary' do
+  = t('stall.checkout.payment_return.back_to_shop')

data/app/views/checkout/steps/_shipping_method.html.haml

@@ -1,6 +1,6 @@
 %h1= t('stall.checkout.shipping_method.title')
 
-= simple_form_for cart, as: :cart, url: step_path(cart) do |form|
+= simple_form_for cart, as: :cart, url: step_path do |form|
   = form.fields_for :shipment do |shipment_fields|
     = shipment_fields.association :shipping_method, as: :radio_buttons
 

data/app/views/stall/admin_mailer/order_paid_email.html.haml

@@ -0,0 +1,4 @@
+%table
+  %tr
+    %td
+      = render partial: 'stall/shared/mailers/cart', locals: { cart: @cart }

data/app/views/stall/carts/show.html.haml

@@ -1,35 +1,63 @@
 .cart-recap{ data: { :'cart-recap' => true } }
-  = simple_form_for @cart, url: cart_path(@cart), as: :cart do |form|
+  = simple_form_for @cart, url: cart_path(@cart), as: :cart, remote: true, data: { :'cart-form' => true } do |form|
     %table.table.table-striped
       %thead
         %tr
-          %th= Stall::LineItem.human_attribute_name(:name)
-          %th= Stall::LineItem.human_attribute_name(:unit_price)
-          %th= Stall::LineItem.human_attribute_name(:quantity)
-          %th= Stall::LineItem.human_attribute_name(:price)
+          %th= LineItem.human_attribute_name(:name)
+          %th= LineItem.human_attribute_name(:unit_price)
+          %th= LineItem.human_attribute_name(:quantity)
+          %th= LineItem.human_attribute_name(:price)
+          %th
+
       %tbody
         = form.fields_for :line_items do |line_item_fields|
           %tr{ data: { :'line-item-id' => line_item_fields.object.id } }
             %td= line_item_fields.object.name
             %td= line_item_fields.object.unit_price
-            %td= line_item_fields.input_field :quantity, class: 'form-control', data: { :'quantity-field' => true }
+            %td= line_item_fields.input_field :quantity, spinner: false, class: 'form-control', data: { :'quantity-field' => true }
             %td= line_item_fields.object.price
+            %td= link_to_remove_association '×'.html_safe, line_item_fields
+
+        - if @cart.subtotal != @cart.total_price
+          %tr
+            %td{ colspan: 3 }= t('stall.carts.recap.subtotal')
+            %td= number_to_currency(@cart.subtotal)
+            %td
+
+        - if @cart.shipment && @cart.shipment.shipping_method
+          %tr
+            %td{ colspan: 3 }
+              = t('stall.carts.recap.total_shipment_price')
+              \:
+              = @cart.shipment.shipping_method.name
+
+            %td= number_to_currency(@cart.shipment.price)
+            %td
+
+        - @cart.adjustments.each do |adjustment|
+          %tr
+            %td{ colspan: 3 }= adjustment.name
+            %td= number_to_currency(adjustment.price)
+            %td
 
         %tr
           %td{ colspan: 3 }= t('stall.carts.recap.total_eot_price')
           %td= number_to_currency(@cart.total_eot_price)
+          %td
 
         %tr
           %td{ colspan: 3 }= t('stall.carts.recap.total_vat')
           %td= number_to_currency(@cart.total_vat)
+          %td
 
         %tr
           %td{ colspan: 3 }= t('stall.carts.recap.total_price')
           %td= number_to_currency(@cart.total_price)
+          %td
 
     .form-actions
-      %button.btn.btn-default{ type: 'submit' }
+      %button.btn.btn-default{ type: 'submit', data: { :'cart-update-button' => true } }
         = t('stall.carts.recap.update')
 
-      = link_to checkout_path(@cart), class: 'btn btn-primary' do
+      = link_to checkout_path(current_cart_key), class: 'btn btn-primary' do
         = t('stall.carts.recap.validate')

data/app/views/stall/customer_mailer/order_paid_email.html.haml

@@ -0,0 +1,8 @@
+%table
+  %tr
+    %td
+      = t('stall.mailers.customer.order_paid_email.intro')
+
+  %tr
+    %td
+      = render partial: 'stall/shared/mailers/cart', locals: { cart: @cart }

data/app/views/stall/line_items/_added.html.haml

@@ -1,4 +1,4 @@
-.modal.fade{ role: 'dialog', tabindex: '-1', data: { :'cart' => { :'total-quantity' => current_cart.total_quantity } } }
+.modal.fade{ role: 'dialog', tabindex: '-1', data: { :'cart' => { token: current_cart.token, :'total-quantity' => current_cart.total_quantity } } }
   .modal-dialog
     .modal-content
       .modal-header

data/app/views/stall/shared/mailers/_address.html.haml

@@ -0,0 +1,18 @@
+= address.civility_name
+= address.first_name
+= address.last_name
+%br
+
+= address.address
+%br
+
+- if address.address_details.present?
+  = address.address_details
+  %br
+
+= [:zip, :city, :state, :country_name].map { |prop| address.send(prop).presence }.compact.join(', ')
+
+%br
+
+- if address.phone.present?
+  = address.phone

data/app/views/stall/shared/mailers/_cart.html.haml

@@ -0,0 +1,114 @@
+%table
+  %tbody
+    %tr
+      %td
+        %table
+          %tbody
+            %tr
+              %td
+                = t('stall.carts.recap.order_ref', ref: cart.reference)
+            %tr
+              %td
+                = t('stall.carts.recap.ordered_at', at: l(cart.created_at))
+
+    %tr
+      %td
+        %table
+          %tbody
+            %tr
+              %td
+                %h2= Cart.human_attribute_name(:billing_address)
+                = render partial: 'stall/shared/mailers/address', locals: { address: cart.billing_address }
+
+              %td
+                %h2= Cart.human_attribute_name(:shipping_address)
+                = render partial: 'stall/shared/mailers/address', locals: { address: cart.shipping_address }
+
+    %tr
+      %td
+        %table
+          %thead
+            %tr
+              %th= LineItem.human_attribute_name(:name)
+              %th= LineItem.human_attribute_name(:unit_price)
+              %th= LineItem.human_attribute_name(:quantity)
+              %th= LineItem.human_attribute_name(:price)
+
+          %tbody
+            - cart.line_items.each do |line_item|
+              %tr
+                %td= line_item.name
+                %td= number_to_currency(line_item.unit_price)
+                %td= line_item.quantity
+                %td= number_to_currency(line_item.price)
+
+          %tfoot
+            - if cart.subtotal != cart.total_price
+              %tr
+                %td{ colspan: 3 }= t('stall.carts.recap.subtotal')
+                %td= number_to_currency(cart.subtotal)
+
+            - if cart.shipment && cart.shipment.shipping_method
+              %tr
+                %td{ colspan: 3 }
+                  = t('stall.carts.recap.total_shipment_price')
+                  \:
+                  = cart.shipment.shipping_method.name
+
+                %td= number_to_currency(cart.shipment.price)
+
+            - cart.adjustments.each do |adjustment|
+              %tr
+                %td{ colspan: 3 }= adjustment.name
+                %td= number_to_currency(adjustment.price)
+
+            %tr
+              %td{ colspan: 3 }= t('stall.carts.recap.total_eot_price')
+              %td= number_to_currency(cart.total_eot_price)
+
+            %tr
+              %td{ colspan: 3 }= t('stall.carts.recap.total_vat')
+              %td= number_to_currency(cart.total_vat)
+
+            %tr
+              %td{ colspan: 3 }= t('stall.carts.recap.total_price')
+              %td= number_to_currency(cart.total_price)
+
+    %tr
+      %td
+        %table
+          %tbody
+            %tr
+              %td{ colspan: 2 }
+                %strong= Cart.human_attribute_name(:payment)
+
+            %tr
+              %td
+                = Payment.human_attribute_name(:payment_method)
+              %td
+                = cart.payment.payment_method.name
+
+            %tr
+              %td
+                = Payment.human_attribute_name(:state)
+              %td
+                - if cart.payment.paid?
+                  = t("stall.carts.recap.paid_at", at: cart.payment.paid_at)
+                - else
+                  = t("activerecord.enums.payment.state.#{ cart.payment.state }")
+
+            %tr
+              %td{ colspan: 2 }
+                %strong= Cart.human_attribute_name(:shipment)
+
+            %tr
+              %td
+                = Shipment.human_attribute_name(:shipping_method)
+              %td
+                = cart.shipment.shipping_method.name
+
+            %tr
+              %td
+                = Shipment.human_attribute_name(:state)
+              %td
+                = t("activerecord.enums.payment.state.#{ cart.shipment.state }")