stall 0.3.2 → 0.3.3

data/app/services/stall/cart_credit_note_creation_service.rb

@@ -10,6 +10,10 @@ module Stall
       if cart.remainder? && !adjustment_exists?
         credit_note = create_credit_note!
         create_adjustment_for!(credit_note)
+
+        true
+      else
+        false
       end
     end
 

data/app/services/stall/cart_payment_validation_service.rb

@@ -10,6 +10,10 @@ module Stall
       cart.payment.pay!
       send_payment_notification_emails!
       create_credit_notes!
+
+      # Always return true since errors should have raised if anything got
+      # wrong.
+      true
     end
 
     private
@@ -20,9 +24,7 @@ module Stall
     end
 
     def create_credit_notes!
-      if cart.remainder?
-        Stall.config.service_for(:cart_credit_note_creation).new(cart).call
-      end
+      Stall.config.service_for(:cart_credit_note_creation).new(cart).call
     end
   end
 end

data/app/services/stall/credit_usage_service.rb

@@ -10,7 +10,8 @@ module Stall
     end
 
     def call
-      raise CartAlreadyPaidError, "Cannot udpate credit note from paid cart"
+      ensure_cart_paid!('Cannot udpate credit note from paid cart')
+
       return false unless enough_credit?
 
       clean_credit_note_adjustments!
@@ -50,7 +51,8 @@ module Stall
     end
 
     def clean_credit_note_adjustments!
-      raise CartAlreadyPaidError, "Cannot remove credit note from paid cart"
+      ensure_cart_paid!('Cannot remove credit note from paid cart')
+
       credit_note_adjustments.each do |adjustment|
         cart.adjustments.destroy(adjustment)
       end
@@ -102,5 +104,9 @@ module Stall
         CreditNoteAdjustment === adjustment
       end
     end
+
+    def ensure_cart_paid!(error_message)
+      raise(CartAlreadyPaidError, error_message) if cart.paid?
+    end
   end
 end

data/app/services/stall/omniauth_user_authentication_service.rb

@@ -0,0 +1,48 @@
+module Stall
+  class OmniauthUserAuthenticationService < Stall::BaseService
+    attr_reader :email, :auth
+
+    def initialize(email, auth)
+      @email = email
+      @auth = auth
+    end
+
+    def call
+      if existing_user
+        ensure_omniauth_account!(existing_user, auth)
+        existing_user
+      else
+        create_user_from_auth!
+      end
+    end
+
+    private
+
+    def ensure_omniauth_account(user, auth)
+      account = user.user_omniauth_accounts.find { |account| account.provider == auth.provider }
+      return account if account
+
+      user.user_omniauth_accounts.build(provider: auth.provider, uid: auth.uid)
+    end
+
+    def ensure_omniauth_account!(user, auth)
+      ensure_omniauth_account(user, auth)
+      user.save!
+    end
+
+    def existing_user
+      @existing_user ||= User.joins(:user_omniauth_accounts).where(
+        '(stall_user_omniauth_accounts.provider = ? AND stall_user_omniauth_accounts.uid = ?) OR stall_users.email = ?',
+        auth.provider, auth.uid, email
+      ).first
+    end
+
+    def create_user_from_auth!
+      User.create! do |user|
+        user.email = email
+        user.password = Devise.friendly_token
+        ensure_omniauth_account(user, auth)
+      end
+    end
+  end
+end

data/app/services/stall/product_list_staleness_handling_service.rb

@@ -15,7 +15,7 @@ module Stall
     def handle_line_items
       cart.line_items.each do |line_item|
         if stale?(line_item)
-          cart.line_items.delete(line_item) 
+          cart.line_items.delete(line_item)
         else
           handle_valid_line_item(line_item)
         end
@@ -26,8 +26,11 @@ module Stall
       # Override this method
     end
 
-    def stale? line_item
-      line_item.sellable.nil? || !line_item.sellable.published?
+    def stale?(line_item)
+      # The line item does not match a sellable (product deleted)
+      return true unless (sellable = line_item.sellable)
+      # The sellable is not published anymore
+      line_item.sellable.try(:published?) == false
     end
   end
 end

data/app/services/stall/products_search_service.rb

@@ -0,0 +1,23 @@
+module Stall
+  class ProductsSearchService < Stall::BaseService
+    attr_reader :products, :params, :search
+    alias_method :form, :search
+
+    def initialize(products, params)
+      @products = products
+      @params = params
+    end
+
+    def call
+      @search = products.ransack(params[:search])
+    end
+
+    def search
+      @search || call
+    end
+
+    def records
+      search.result.distinct
+    end
+  end
+end

data/app/services/stall/shipping_notification_service.rb

@@ -9,8 +9,8 @@ module Stall
 
     def call
       if shipment.update(shipment_params)
-        send_customer_email
         update_shipment
+        send_customer_email
 
         true
       else

data/app/views/admin/carts/_filters.html.haml

@@ -1,17 +1,23 @@
 = search_form_for @q, builder: SimpleForm::FormBuilder, url: @component.path, html: { data: { :'filters-form' => true } } do |form|
   .row
-    .col-md-3
+    .col-md-2
       = form.input_field :payment_paid_at_null, as: :selectize, collection: [{ text: t('activerecord.enums.payment.state.paid'), value: '0' }, { text: t('activerecord.enums.payment.state.pending'), value: '1' }], placeholder: @component.model.human_attribute_name(:payment)
 
-    .col-md-3
+    .col-md-2
       = form.input_field :state_eq, as: :selectize, collection: DefaultCheckoutWizard.steps.map { |step| { text: t("activerecord.enums.cart.state.#{ step }"), value: step } }, placeholder: @component.model.human_attribute_name(:state)
 
-    .col-md-4
+    .col-md-2
+      = form.input_field :payment_paid_at_gteq, as: :date, placeholder: t('para.stall.cart.filters.paid_after')
+
+    .col-md-2
+      = form.input_field :payment_paid_at_lteq, as: :date, placeholder: t('para.stall.cart.filters.paid_before')
+
+    .col-md-3
       .input-group
         %span.input-group-addon
           %i.fa.fa-search
 
         = form.input_field :reference_or_customer_email_cont, as: :string, placeholder: t('para.shared.search'), class: 'form-control'
 
-    .col-md-2
+    .col-md-1
       = form.submit t('para.shared.search'), class: 'btn btn-default btn-block'

data/app/views/admin/carts/_form.html.haml

@@ -1,6 +1,6 @@
 = para_form_for(resource) do |form|
   = form.tabs do |tabs|
-    = tabs.tab :informations do
+    = tabs.tab :informations, icon: 'info-circle' do
       = form.input :reference
       = form.input :total_price do
         .input-group
@@ -10,8 +10,8 @@
 
       = form.actions
 
-    = tabs.tab :billing do
-      = form.input :customer, :as => :nested_one
+    = tabs.tab :billing, icon: 'user' do
+      = form.input :customer, as: :nested_one
 
       = form.input :billing_address do
         .nested-one-field
@@ -20,8 +20,8 @@
 
       = form.actions
 
-    = tabs.tab :shipping do
-      = form.input :shipment, :as => :nested_one
+    = tabs.tab :shipping, icon: 'truck' do
+      = form.input :shipment, as: :nested_one
 
       = form.input :shipping_address do
         .nested-one-field
@@ -30,13 +30,13 @@
 
       = form.actions
 
-    = tabs.tab :payment do
-      = form.input :payment, :as => :nested_one
+    = tabs.tab :payment, icon: 'credit-card' do
+      = form.input :payment, as: :nested_one
 
       = form.actions
 
-    = tabs.tab :line_items do
-      = form.input :line_items, :as => :nested_many
+    = tabs.tab :line_items, icon: 'list' do
+      = form.input :line_items, as: :nested_many
 
       = form.actions
 

data/app/views/admin/manufacturers/_form.html.haml

@@ -0,0 +1,7 @@
+= para_form_for(resource) do |form|
+  = form.fieldset do
+    = form.input :name
+    = form.input :logo, as: :image
+    = form.input :products, as: :selectize
+
+  = form.actions

data/app/views/admin/manufacturers/_table.html.haml

@@ -0,0 +1,8 @@
+= resources_table(model: model, component: component) do |table|
+  = table.header do
+    = table.header_for(:name)
+    = table.header_for(:logo)
+
+  = table.rows(resources) do |resource|
+    = table.data_for(resource, :name)
+    = table.data_for(resource, :logo)

data/app/views/admin/product_categories/_form.html.haml

@@ -0,0 +1,7 @@
+= para_form_for(resource) do |form|
+  = form.fieldset do
+    = form.input :name
+    = form.input :slug
+    = form.input :parent, as: :selectize
+
+  = form.actions

data/app/views/admin/products/_form.html.haml

@@ -0,0 +1,23 @@
+= para_form_for(resource) do |form|
+  = form.tabs do |tabs|
+    = tabs.tab :informations, icon: 'info-circle' do
+      = form.input :visible
+      = form.input :name
+      = form.input :slug, as: :string
+
+      = form.input :product_category, as: :selectize, collection: Para.components.product_categories.resources.leaves
+      = form.input :manufacturer, as: :selectize
+
+      = form.input :suggested_products, as: :selectize
+
+    = tabs.tab :images, icon: 'picture-o' do
+      = form.input :images, as: :nested_many
+
+    = tabs.tab :descriptions, icon: 'font' do
+      = form.input :description, as: :redactor
+      = form.input :product_details, as: :nested_many
+
+    = tabs.tab :variants, icon: 'list' do
+      = form.input :variants, as: :variants_matrix
+
+    = form.actions

data/app/views/admin/products/_table.html.haml

@@ -1,12 +1,14 @@
 = resources_table(model: model, component: component) do |table|
   = table.header do
+    = table.header_for(:image)
     = table.header_for(:name)
-    = table.header_for(:published)
+    = table.header_for(:visible)
     = table.header_for(:price, sort: :variants_price)
     = table.header_for(:product_category, sort: :product_category_name)
 
   = table.rows(resources) do |resource|
+    %td= image_tag(resource.image.url(:thumb)) if resource.image
     = table.data_for(resource, :name)
-    = table.data_for(resource, :published)
+    = table.data_for(resource, :visible)
     = table.data_for(resource, :price)
     = table.data_for(resource, :product_category)

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

@@ -1,8 +1,8 @@
 = render partial: 'stall/checkout/steps/navigation', locals: { cart: cart, wizard: @wizard, step: @step }
 
 -# Display sign in form for users that are not signed in
-- unless stall_user_signed_in?
-  - resource = Stall.config.default_user_model.new
+- unless user_signed_in?
+  - resource = User.new
   = render partial: 'stall/customers/sign_in', locals: { resource: resource, resource_name: resource.model_name.element }
 
 %h1= t('stall.checkout.informations.title')

data/app/views/para/admin/resources/_variant_row.html.haml

@@ -10,7 +10,7 @@
 
   - all_properties.each do |property_config|
     -# Hide all fields for new records
-    %td{ class: ('hidden' unless form.object.persisted? && property_config.active?), data: { :'variants-matrix-variant-property' => property_config.property.id } }
+    %td{ class: ('hidden' unless property_config.active?), data: { :'variants-matrix-variant-property' => property_config.property.id } }
       = form.fields_for :variant_property_values, [property_config.variant_property_value_or_build_for(form.object)] do |fields|
         %span{ data: { :'property-name' => true } }
           = property_config.property_value_for(form.object).try(:name)
@@ -22,3 +22,11 @@
       = form.input_field :price, class: 'form-control'
       %span.input-group-addon
         = form.object.currency.symbol
+
+  - if Stall.config.manage_inventory
+    %td
+      = form.input_field :stock, class: 'form-control'
+
+  %td
+    %button.btn.btn-default.btn-shadow.hint--left{ type: 'button', :'aria-label' => t('para.stall.variants_matrix.apply_to_all'), data: { :'variants-matrix-apply-to-all' => true } }
+      = fa_icon 'sort-amount-asc'

data/app/views/para/admin/resources/_variant_row_header.html.haml

@@ -0,0 +1,14 @@
+%tr
+  %th{ data: { :'variants-matrix-variant-enabled-cell' => true } }
+    = t('para.stall.variants_matrix.enabled')
+
+  - properties.each do |variants_property_config|
+    %th{ data: { :'variants-matrix-variant-property-cell' => true } }
+      = variants_property_config.property.name
+
+  %th= t('para.stall.variants_matrix.price')
+
+  - if Stall.config.manage_inventory
+    %th= t('para.stall.variants_matrix.stock')
+
+  %th

data/app/views/para/stall/inputs/_variant_select.html.haml

@@ -8,7 +8,7 @@
     - else
       .variant-select-property{ data: { :'variant-select-property' => property_config.property.id } }
         .row
-          .col-md-3
+          .variant-select-label-container{ class: variant_label_class }
             = label :property_config, property_config.property.id, property_config.property.name, class: 'variant-select-label'
-          .col-md-9
-            = select :property_config, property_config.property.id, options_for_select(property_config.available_options), { include_blank: true }, placeholder: t('para.stall.variant_select.property_placeholder'), class: 'variant-select-property-input', autocomplete: 'off', data: { selectize: true }
+          .variant-select-property-container{ class: variant_property_class }
+            = select :property_config, property_config.property.id, options_for_select(property_config.available_options), { include_blank: true }, placeholder: t('para.stall.variant_select.property_placeholder'), class: 'variant-select-property-input', autocomplete: 'off', data: { selectize: true, multi: false }

data/app/views/para/stall/inputs/_variants_matrix.html.haml

@@ -1,11 +1,10 @@
-.variants-matrix-input-container{ data: { :'variants-matrix-input' => true } }
+.variants-matrix-input-container{ data: { :'variants-matrix-input' => true, :'allow-empty-variant' => allow_empty_variant } }
   = form.input :properties do
     .variants-matrix-properties-select{ data: { :'variants-matrix-properties-select' => true } }
       %p.help-block= t('para.stall.variants_matrix.choose_properties_to_build_variants')
 
       .dropdown
         %button.btn.btn-primary{ type: 'button', data: { toggle: 'dropdown' } }
-          = fa_icon 'plus'
           = t('para.stall.variants_matrix.add_property')
           %span.caret
         .dropdown-menu.variants-matrix-property-selector
@@ -14,27 +13,19 @@
               = check_box :properties, :activated, { checked: variants_property_config.active? , autocomplete: 'off', data: { :'variants-matrix-property-selector-input' => true } }, variants_property_config.property.id
               = variants_property_config.property.name
 
-      %ul.list-group
+      %ul.list-group.variants-matrix-properties-list
         - all_properties.each do |variants_property_config|
           %li.list-group-item{ class: ('hidden' unless variants_property_config.active?), data: { :'variants-matrix-property-id' => variants_property_config.property.id } }
-            .row
-              .col-md-3
-                = label :variants_property_config, variants_property_config.property.id, variants_property_config.property.name
-              .col-md-9
-                = select :variants_property_config, variants_property_config.property.id, options_for_select(variants_property_config.options), {}, multiple: true, autocomplete: 'off', data: { :'variants-matrix-property-select' => variants_property_config.property.name }
+            .form-group
+              = label :variants_property_config, variants_property_config.property.id, variants_property_config.property.name, class: 'control-label'
+              = select :variants_property_config, variants_property_config.property.id, options_for_select(variants_property_config.options), {}, multiple: true, autocomplete: 'off', data: { :'variants-matrix-property-select' => variants_property_config.property.name }
 
   = form.input :variants do
     %table.table.table-hover
       %thead{ data: { :'variants-matrix-variants-table-header' => true } }
-        %tr
-          %th{ data: { :'variants-matrix-variant-enabled-cell' => true } }= t('para.stall.variants_matrix.enabled')
+        = render partial: find_partial_for(model, :variant_row_header), locals: { form: form, properties: properties }
 
-          - properties.each do |variants_property_config|
-            %th{ data: { :'variants-matrix-variant-property-cell' => true } }= variants_property_config.property.name
-
-          %th= t('para.stall.variants_matrix.price')
-
-      %tbody{ data: { :'variants-matrix-variants-container' => "#{ dom_identifier }" } }
+      %tbody{ data: { :'variants-matrix-variants-container' => dom_identifier } }
         = form.fields_for attribute_name, variants do |variant_fields|
           = render partial: find_partial_for(model, :variant_row), locals: { form: variant_fields }.merge(variant_row_locals)
 

data/app/views/para/stall/inputs/shipping_notes/new.html.haml

@@ -0,0 +1,22 @@
+= modal id: "shipment-modal-#{ @cart.id }", fade: false do |modal|
+  = modal.header do
+    = t('para.stall.shipping_note.create')
+
+  = simple_form_for @shipment, url: @component.relation_path(@cart, :shipping_note), method: :post, remote: true do |form|
+    = modal.body do
+      - if @shipment.notification_email_sent_at
+        .alert.alert-warning
+          = t('para.stall.shipping_note.notification_already_sent_at', date: l(@shipment.notification_email_sent_at)).html_safe
+
+      .well
+        = t('para.stall.shipping_note.help').html_safe
+
+      = form.input :shipping_method, as: :selectize
+      = form.input :tracking_code, hint: t('para.stall.shipping_note.tracking_code_help').html_safe
+
+    = modal.footer do
+      %button.btn.btn-default{ type: 'button', data: { dismiss: 'modal' } }
+        = t('stall.shared.cancel')
+
+      %button.btn.btn-primary{ type: 'submit' }
+        = t('stall.shared.send')