stall 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 98069c4e8cde848ade9836933bf11f176aae37b5
-  data.tar.gz: baf0ab5fd49de75964401f8b01003c03446e4663
+  metadata.gz: af3519db9164c6f4fd61e1e56f019ef90c3e6a5d
+  data.tar.gz: 9fad0f1035c6510b67c80865b6284f844e4686ca
 SHA512:
-  metadata.gz: 2edc779f219c016fb3b1a440c1a53cd2b8c6954e09845381ae3a90e8dec033fc30761e2765523aa0e5953bc64cd2f5ecc0b3b7407a09055fcf7066e87d1c2143
-  data.tar.gz: d27a12120af62029f503c481f3ca07d82630a1b5504ce7c39f9b06cc9bee5642c3879573c25600262a11b38cc4c1380245372b54abeae436e47634b4a7515071
+  metadata.gz: 31367405801aa97eca7302b4286ee0d39c46540ba389eff0c43a3a9461123217c0414afa82249d073b3ebef0f143a6f1fbc151a5e63235c0773681eb8e873861
+  data.tar.gz: 8114b8156abd5b6cd53d861d6c952347f01f09c49040c30a67c0c3224fd7c3297e2fa09248ac75d46ef4bacc2db9c14759d01420d84c865ea5971c496afe5df2

data/app/controllers/para/stall/admin/carts_controller.rb

@@ -13,14 +13,6 @@ module Para
           # cleaned up by the rake task
           @resources = @resources.filled
         end
-
-        private
-
-        def shipment_params
-          params.require(:shipment).permit(
-            :carrier, :tracking_code, :point_of_sale_id
-          )
-        end
       end
     end
   end

data/app/controllers/para/stall/admin/shipping_notes_controller.rb

@@ -0,0 +1,33 @@
+module Para
+  module Stall
+    module Admin
+      class ShippingNotesController < ::Para::Admin::ComponentController
+        before_filter :load_cart
+        authorize_resource :cart
+        authorize_resource :shipment
+
+        def new
+          render layout: false
+        end
+
+        def create
+          service = ::Stall.config.service_for(:shipping_notification).new(@cart, params)
+
+          if service.call
+            render 'sent', layout: false
+          else
+            flash_message(:error)
+            render 'new', layout: false
+          end
+        end
+
+        private
+
+        def load_cart
+          @cart = ProductList.find(params[:resource_id])
+          @shipment = @cart.shipment || @cart.build_shipment
+        end
+      end
+    end
+  end
+end

data/app/mailers/stall/customer_mailer.rb

@@ -9,5 +9,24 @@ module Stall
              subject: I18n.t('stall.mailers.customer.order_paid_email.subject', ref: cart.reference)
       end
     end
+
+    def order_shipped_email(cart)
+      I18n.with_locale(cart.customer.locale) do
+        @cart = cart
+
+        calculator_class = Stall::Shipping::Calculator.for(cart.shipment.shipping_method)
+        @calculator = calculator_class.new(cart, cart.shipment.shipping_method)
+
+        @tracking_url = if @calculator.trackable?
+          cart.shipment.tracking_code.presence && @calculator.tracking_url
+        end
+
+        subject = t('stall.mailers.customer.order_shipped_email.subject', ref: cart.reference)
+
+        mail from: sender_email_for(cart),
+             to: cart.customer.email,
+             subject: subject
+      end
+    end
   end
 end

data/app/models/billing_address.rb

@@ -1,2 +1,3 @@
 class BillingAddress < Address
+  include Stall::Models::BillingAddress
 end

data/app/models/manufacturer.rb

@@ -0,0 +1,3 @@
+class Manufacturer < ActiveRecord::Base
+  include Stall::Models::Manufacturer
+end

data/app/models/shipping_address.rb

@@ -1,2 +1,3 @@
 class ShippingAddress < Address
+  include Stall::Models::ShippingAddress
 end

data/app/models/stall/models/address.rb

@@ -30,6 +30,14 @@ module Stall
           iso_state['name'] if iso_state
         end
 
+        def billing?
+          false
+        end
+
+        def shipping?
+          false
+        end
+
         private
 
         def iso_country

data/app/models/stall/models/billing_address.rb

@@ -0,0 +1,9 @@
+module Stall
+  module Models
+    module BillingAddress
+      def billing?
+        true
+      end
+    end
+  end
+end

data/app/models/stall/models/manufacturer.rb

@@ -0,0 +1,18 @@
+module Stall
+  module Models
+    module Manufacturer
+      extend ActiveSupport::Concern
+
+      included do
+        self.table_name = 'stall_manufacturers'
+
+        has_many :products, dependent: :nullify
+
+        has_attached_file :logo
+        validates_attachment_content_type :logo, content_type: /\Aimage\/.*\Z/
+
+        validates :name, presence: true
+      end
+    end
+  end
+end

data/app/models/stall/models/product.rb

@@ -11,6 +11,7 @@ module Stall
         friendly_id :name, use: [:slugged, :finders]
 
         belongs_to :product_category
+        belongs_to :manufacturer
 
         has_many :variants, dependent: :destroy, inverse_of: :product
         accepts_nested_attributes_for :variants, allow_destroy: true
@@ -27,18 +28,14 @@ module Stall
         validates_attachment :image, content_type: { content_type: /\Aimage\/.*\z/ }
 
         scope :visible, -> { where(visible: true) }
+      end
 
-        def should_generate_new_friendly_id?
-          slug.blank?
-        end
-
-        def vat_rate
-          Stall.config.vat_rate
-        end
+      def vat_rate
+        Stall.config.vat_rate
+      end
 
-        def price
-          variants.map(&:price).min
-        end
+      def price
+        variants.map(&:price).min
       end
     end
   end

data/app/models/stall/models/product_category.rb

@@ -11,20 +11,18 @@ module Stall
 
         extend FriendlyId
         friendly_id :name, use: [:slugged, :finders]
-        
+
         has_many :products, dependent: :nullify
 
         validates :name, presence: true
 
         scope :ordered, -> { order(position: 'asc') }
+      end
 
-        def self.max_depth
+      module ClassMethods
+        def max_depth
           2
         end
-
-        def should_generate_new_friendly_id?
-          slug.blank?
-        end
       end
     end
   end

data/app/models/stall/models/shipping_address.rb

@@ -0,0 +1,9 @@
+module Stall
+  module Models
+    module ShippingAddress
+      def shipping?
+        true
+      end
+    end
+  end
+end

data/app/models/stall/models/variant.rb

@@ -21,13 +21,27 @@ module Stall
 
         monetize :price_cents, with_model_currency: :currency, allow_nil: false
 
-        delegate :name, :image, :image?, :vat_rate, to: :product, allow_nil: true
+        before_validation :refresh_name
+
+        delegate :image, :image?, :vat_rate, to: :product, allow_nil: true
 
         scope :published, -> { where(published: true) }
 
         def currency
           @currency ||= Money::Currency.new(Stall.config.default_currency)
         end
+
+        private
+
+        def refresh_name
+          product_name = product.try(:name)
+
+          properties = variant_property_values.map do |variant_property_value|
+            variant_property_value.property_value.name
+          end
+
+          self.name = [product_name, properties.join(' - ')].join(' / ')
+        end
       end
     end
   end

data/app/services/stall/credit_usage_service.rb

@@ -1,5 +1,7 @@
 module Stall
   class CreditUsageService < Stall::BaseService
+    class CartAlreadyPaidError < StandardError; end
+
     attr_reader :cart, :params
 
     def initialize(cart, params = {})
@@ -8,6 +10,7 @@ module Stall
     end
 
     def call
+      raise CartAlreadyPaidError, "Cannot udpate credit note from paid cart"
       return false unless enough_credit?
 
       clean_credit_note_adjustments!
@@ -47,6 +50,7 @@ module Stall
     end
 
     def clean_credit_note_adjustments!
+      raise CartAlreadyPaidError, "Cannot remove credit note from paid cart"
       credit_note_adjustments.each do |adjustment|
         cart.adjustments.destroy(adjustment)
       end

data/app/services/stall/shipping_notification_service.rb

@@ -0,0 +1,41 @@
+module Stall
+  class ShippingNotificationService < Stall::BaseService
+    attr_reader :cart, :params
+
+    def initialize(cart, params = {})
+      @cart = cart
+      @params = params
+    end
+
+    def call
+      if shipment.update(shipment_params)
+        send_customer_email
+        update_shipment
+
+        true
+      else
+        false
+      end
+    end
+
+    private
+
+    def shipment
+      @shipment ||= cart.shipment || cart.build_shipment
+    end
+
+    def shipment_params
+      params.require(:shipment).permit(:shipping_method_id, :tracking_code)
+    end
+
+    def send_customer_email
+      Stall::CustomerMailer.order_shipped_email(cart).deliver
+    end
+
+    def update_shipment
+      shipment.sent_at ||= Time.now
+      shipment.notification_email_sent_at = Time.now
+      shipment.shipped!
+    end
+  end
+end

data/app/views/admin/shipments/_fields.html.haml

@@ -5,3 +5,10 @@
 
 = form.input :price
 = form.input :sent_at, wrapper: :horizontal_form
+
+- if form.object.cart.persisted?
+  = form.input :shipping_note do
+    = link_to @component.relation_path(form.object.cart, :shipping_note, action: :new), class: 'btn btn-default', remote: true, data: { :'remote-modal-form' => true, :'refresh-on-close' => true } do
+      = fa_icon 'envelope'
+      = t('para.stall.shipping_note.create')
+

data/app/views/para/stall/admin/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')

data/app/views/para/stall/admin/shipping_notes/sent.html.haml

@@ -0,0 +1,11 @@
+= modal id: "shipment-modal-#{ @cart.id }", fade: false do |modal|
+  = modal.header do
+    = t('para.stall.shipping_note.sent')
+
+  = modal.body do
+    %p= t('para.stall.shipping_note.sent_description').html_safe
+
+  = modal.footer do
+    %button.btn.btn-default{ type: 'button', data: { dismiss: 'modal' } }
+      = t('stall.shared.close')
+

data/app/views/stall/addresses/_fields.html.haml

@@ -3,7 +3,7 @@
     = form.fields_for :shipping_address do |address_form|
       = render partial: 'stall/addresses/nested_fields', locals: { form: address_form }
 
-  = form.input :use_another_address_for_billing, as: :boolean, input_html: { data: { :'use-another-address-for-billing' => true } }
+  = form.input :use_another_address_for_billing, as: :boolean, input_html: { checked: (params[:use_another_address_for_billing] || form.object.billing_address?), data: { :'use-another-address-for-billing' => true } }
 
   %fieldset{ class: ('hidden' unless params[:use_another_address_for_billing] == '1'), data: { :'address-form' => :billing } }
     = form.fields_for :billing_address do |address_form|

data/app/views/stall/credit_note_adjustments/_form.html.haml

@@ -1,4 +1,4 @@
-- if stall_user_signed_in? && available_customer_credit_for?(cart)
+- if stall_user_signed_in? && available_customer_credit_for?(cart) && !cart.paid?
   = simple_form_for cart, url: cart_credit_path(cart), method: (credit_used_for?(@cart) ? :delete : :patch), html: { class: 'cart-credit-form', data: { :'cart-credit-form' => true } } do |form|
     = hidden_field_tag :_return_to, request.fullpath
 

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

@@ -0,0 +1,18 @@
+%table
+  %tr
+    %td
+      = t('stall.mailers.customer.order_shipped_email.intro', ref: @cart.reference, time: l(Date.today)).html_safe
+
+      - if @tracking_url
+        %br
+        %br
+        = t('stall.mailers.customer.order_shipped_email.shipping_method_name', name: @cart.shipment.shipping_method.name).html_safe
+        %br
+        = t('stall.mailers.customer.order_shipped_email.tracking_code', code: @cart.shipment.tracking_code).html_safe
+        %br
+        = t('stall.mailers.customer.order_shipped_email.tracking_url', link: link_to(@tracking_url, @tracking_url)).html_safe
+
+      %br
+      %br
+
+      = render partial: 'stall/shared/mailers/shipping_note', locals: { cart: @cart, line_items: @cart.line_items }

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

@@ -11,18 +11,25 @@
               %td
                 = t('stall.carts.recap.ordered_at', at: l(cart.created_at))
 
+    %tr
+      %td{ height: 20 }
+
     %tr
       %td
-        %table
+        %table{ width: '100%' }
           %tbody
             %tr
               %td
                 %h2= Cart.human_attribute_name(:billing_address)
-                = render partial: 'stall/shared/mailers/address', locals: { address: cart.billing_address || cart.shipping_address }
-
               %td
                 %h2= Cart.human_attribute_name(:shipping_address)
-                = render partial: 'stall/shared/mailers/address', locals: { address: cart.shipping_address }
+
+            %tr
+              %td= render partial: 'stall/shared/mailers/address', locals: { address: cart.billing_address }
+              %td= render partial: 'stall/shared/mailers/address', locals: { address: cart.shipping_address }
+
+    %tr
+      %td{ height: 20 }
 
     %tr
       %td

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

@@ -0,0 +1,52 @@
+%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{ height: 20 }
+
+    %tr
+      %td
+        %table{ width: '100%' }
+          %tbody
+            %tr
+              %td
+                %h2= Cart.human_attribute_name(:billing_address)
+              %td
+                %h2= Cart.human_attribute_name(:shipping_address)
+
+            %tr
+              %td= render partial: 'stall/shared/mailers/address', locals: { address: cart.billing_address }
+              %td= render partial: 'stall/shared/mailers/address', locals: { address: cart.shipping_address }
+
+    %tr
+      %td{ height: 20 }
+
+    %tr
+      %td
+        %table
+          %thead
+            %tr
+              %th= LineItem.human_attribute_name(:name)
+              %th= LineItem.human_attribute_name(:quantity)
+
+          %tbody
+            - line_items.each do |line_item|
+              %tr
+                %td= line_item.name
+                %td= line_item.quantity
+
+            %tr
+              %td
+                %b= t('stall.carts.recap.total_quantity')
+              %td
+                %b= line_items.map(&:quantity).sum

data/config/locales/stall.fr.yml

@@ -12,6 +12,20 @@ fr:
       variant_select:
         property_placeholder: "Choisissez une option ..."
 
+      shipping_note:
+        create: "Notifier le client de l'expédition de sa commande"
+        notification_already_sent_at: "Un e-mail de notification de livraison a déjà été envoyé au client le %{date}"
+        help: |
+          Un e-mail va être envoyé au client pour le notifier de l'expédition de sa commande.
+          <br>
+          Merci de vérifier les informations de livraison ci-dessous et de cliquer sur "Envoyer"
+        tracking_code_help: |
+          Afin d'envoyer le lien pour le suivi de la livraison au client, merci
+          de renseigner le code de suivi. Si vous laissez ce champ vide, le mail
+          sera bien envoyé mais ne contiendra pas de lien de suivi.
+        sent: "Notification envoyée !"
+        sent_description: "Le client a bien été notifié de l'expédition de sa commande. "
+
   forms:
     tabs:
       cart:
@@ -23,7 +37,9 @@ fr:
 
   stall:
     shared:
+      cancel: "Annuler"
       close: "Fermer"
+      send: "Envoyer"
       sending: "Envoi en cours ..."
 
     carts:
@@ -45,6 +61,7 @@ fr:
         total_eot_price: "Prix total HT"
         total_vat: "Total TVA"
         total_price: "Prix total"
+        total_quantity: "Quantité totale"
         remainder: "Le montant suivant sera transformé en avoir"
         update: "Mettre à jour le panier"
         validate: "Passer la commande"
@@ -140,6 +157,18 @@ fr:
         order_paid_email:
           subject: "Le paiement de votre commande n°%{ref} a bien été effectué !"
           intro: "Votre commande sera traitée dans les meilleurs délais."
+
+        order_shipped_email:
+          subject: "Votre commande n°%{ref} a été expédiée"
+          intro: |
+            Votre commande n°%{ref} a bien été expédiée le
+            <strong>%{time}</strong>
+          shipping_method_name: "Votre colis vous a été envoyé via %{name}"
+          tracking_code: "Votre code de suivi est le suivant : %{code}"
+          tracking_url: |
+            Vous pouvez suivre la livraison de votre commande avec le lien
+            suivant :<br>%{link}
+
       admin:
         order_paid_email:
           subject: "Une nouvelle commande a été passée sur le site - %{ref}"
@@ -171,6 +200,7 @@ fr:
       product_category: "Catégorie"
       variant: "Déclinaison"
       product_detail: "Bloc de description"
+      manufacturer: "Fabricant"
 
     attributes:
       line_item:
@@ -222,6 +252,7 @@ fr:
         shipping_method: "Mode de livraison"
         tracking_code: "Code de suivi"
         state: "État"
+        shipping_note: "Notification"
       payment:
         payment_method: "Mode de paiement"
         paid_at: "Payé le"
@@ -244,6 +275,10 @@ fr:
       product_detail:
         name: "Titre"
         content: "Contenu"
+      manufacturer:
+        name: "Nom du fabricant"
+        logo: "Logo"
+        products: "Produits"
 
   simple_form:
     placeholders:

data/db/migrate/20161129101956_add_type_to_stall_address_ownerships.rb

@@ -25,15 +25,15 @@ class AddTypeToStallAddressOwnerships < ActiveRecord::Migration
 
         if ownership.billing
           billing_address = BillingAddress.new(addressable: ownership.addressable)
-          Stall::Addresses::Copy.new(address, billing_address)
+          Stall::Addresses::Copy.new(address, billing_address).copy
           billing_address.save!
         end
       elsif ownership.billing
         address.type = 'BillingAddress'
-        ownership.save!
-      else
-        ownership.destroy
+        address.save!
       end
+
+      ownership.destroy
     end
 
     remove_column :stall_address_ownerships, :billing

data/db/migrate/20161202080218_add_reference_to_product_lists.rb

@@ -5,9 +5,10 @@ class AddReferenceToProductLists < ActiveRecord::Migration
 
     # Migrate all references stored in the JSON data columns to the new
     # reference column
-    Cart.update_all("reference = data->>'reference'")
+    ProductList.update_all("reference = data->>'reference'")
     # Remove all reference keys in the JSON data columns
-    Cart.update_all("data = (data - 'reference')")
+    # This is not supported before PG 4.5 so we avoid using it
+    # ProductList.update_all("data = (data - 'reference')")
   end
 
   def down

data/db/migrate/20170206091211_add_name_to_stall_variants.rb

@@ -0,0 +1,5 @@
+class AddNameToStallVariants < ActiveRecord::Migration
+  def change
+    add_column :stall_variants, :name, :string
+  end
+end

data/db/migrate/20170217142050_create_stall_manufacturers.rb

@@ -0,0 +1,10 @@
+class CreateStallManufacturers < ActiveRecord::Migration
+  def change
+    create_table :stall_manufacturers do |t|
+      t.string :name
+      t.attachment :logo
+
+      t.timestamps null: false
+    end
+  end
+end

data/db/migrate/20170217143037_add_manufacturer_to_stall_products.rb

@@ -0,0 +1,6 @@
+class AddManufacturerToStallProducts < ActiveRecord::Migration
+  def change
+    add_reference :stall_products, :manufacturer, index: true
+    add_foreign_key :stall_products, :stall_manufacturers, column: :manufacturer_id
+  end
+end

data/db/migrate/20170217153634_add_notification_email_sent_at_to_stall_shipments.rb

@@ -0,0 +1,5 @@
+class AddNotificationEmailSentAtToStallShipments < ActiveRecord::Migration
+  def change
+    add_column :stall_shipments, :notification_email_sent_at, :datetime
+  end
+end

data/lib/generators/stall/shipping/calculator/templates/calculator.rb.erb

@@ -26,4 +26,23 @@ class <%= class_name %> < Stall::Shipping::Calculator
   # def vat_rate
   #   Stall.config.vat_rate
   # end
+
+  # Allow shipping notification e-mails to embed a tracking URL for the shipping
+  # method, and when the `Shipment#tracking_code` is filled for the cart.
+  #
+  # Note : If you make a shipping method trackable, don't forget to define the
+  #        #tracking_url method below
+  #
+  # def trackable?
+  #   true
+  # end
+
+  # Return a URL that will be given to the customer when notified of the
+  # shipping of its order
+  #
+  # def tracking_url
+  #   if (tracking_code = cart.shipment.try(:tracking_code)).present?
+  #     "http://www.my-shipping-service.com/tracking/url?code=#{ tracking_code }"
+  #   end
+  # end
 end

data/lib/para/stall/routes.rb

@@ -3,7 +3,9 @@ module Para
     class Routes < Para::Plugins::Routes
       def draw
         plugin :stall do
-          crud_component controller: '/para/stall/admin/carts'
+          crud_component controller: '/para/stall/admin/carts' do
+            resource :shipping_note, only: [:new, :create]
+          end
         end
       end
     end

data/lib/stall/addressable.rb

@@ -20,5 +20,25 @@ module Stall
 
       attr_accessor :use_another_address_for_billing
     end
+
+    # Allow billing address to fall back to shipping address when not filled
+    def billing_address
+      association(:billing_address).load_target ||
+        association(:shipping_address).load_target
+    end
+
+    def billing_address?
+      billing_address.persisted? && billing_address.billing?
+    end
+
+    # Allow shipping address to fall back to billing address when not filled
+    def shipping_address
+      association(:shipping_address).load_target ||
+        association(:billing_address).load_target
+    end
+
+    def shipping_address?
+      shipping_address.persisted? && shipping_address.billing?
+    end
   end
 end

data/lib/stall/checkout/informations_checkout_step.rb

@@ -52,7 +52,7 @@ module Stall
       # the full permissions nested array
       #
       def cart_params(*attributes)
-        @cart_params ||= params.require(:cart).permit(
+        @cart_params ||= super(
           *merge_arrays(
             [
               :use_another_address_for_billing, :terms,

data/lib/stall/engine.rb

@@ -18,11 +18,9 @@ module Stall
       end
     end
 
-    initializer 'stall.include_cart_helper' do
-      ActiveSupport.on_load(:action_controller) do
-        include Stall::CartHelper
-        include Stall::ArchivedPaidCartHelper
-      end
+    config.to_prepare do
+      ::ApplicationController.send(:include, Stall::CartHelper)
+      ::ApplicationController.send(:include, Stall::ArchivedPaidCartHelper)
     end
 
     initializer 'stall.ensure_shipping_method_for_all_calculators' do

data/lib/stall/shipping/calculator.rb

@@ -20,6 +20,18 @@ module Stall
           'the actual shipping price for the given cart'
       end
 
+      # Override this method in the shipping calculators to declare wether a
+      # shipping method provides a tracking URL or not.
+      def trackable?
+        false
+      end
+
+      def tracking_url
+        raise NoMethodError,
+          'Trackable shipping calculators should override the #tracking_url ' \
+          'method and return a tracking URL for the associated shipment.'
+      end
+
       def eot_price
         price / (1 + (vat_rate / 100.0))
       end

data/lib/stall/version.rb

@@ -1,3 +1,3 @@
 module Stall
-  VERSION = "0.3.1"
+  VERSION = "0.3.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: stall
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - vala
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-05 00:00:00.000000000 Z
+date: 2017-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -337,6 +337,7 @@ files:
 - app/assets/stylesheets/stall/application.css
 - app/assets/stylesheets/stall/carts.css
 - app/controllers/para/stall/admin/carts_controller.rb
+- app/controllers/para/stall/admin/shipping_notes_controller.rb
 - app/controllers/stall/application_controller.rb
 - app/controllers/stall/cart_credits_controller.rb
 - app/controllers/stall/carts_controller.rb
@@ -363,6 +364,7 @@ files:
 - app/models/credit_note_usage.rb
 - app/models/customer.rb
 - app/models/line_item.rb
+- app/models/manufacturer.rb
 - app/models/payment.rb
 - app/models/payment_method.rb
 - app/models/product.rb
@@ -377,6 +379,7 @@ files:
 - app/models/stall/models.rb
 - app/models/stall/models/address.rb
 - app/models/stall/models/adjustment.rb
+- app/models/stall/models/billing_address.rb
 - app/models/stall/models/cart.rb
 - app/models/stall/models/cart_credit_note_adjustment.rb
 - app/models/stall/models/credit_note.rb
@@ -384,6 +387,7 @@ files:
 - app/models/stall/models/credit_note_usage.rb
 - app/models/stall/models/customer.rb
 - app/models/stall/models/line_item.rb
+- app/models/stall/models/manufacturer.rb
 - app/models/stall/models/payment.rb
 - app/models/stall/models/payment_method.rb
 - app/models/stall/models/product.rb
@@ -393,6 +397,7 @@ files:
 - app/models/stall/models/property.rb
 - app/models/stall/models/property_value.rb
 - app/models/stall/models/shipment.rb
+- app/models/stall/models/shipping_address.rb
 - app/models/stall/models/shipping_method.rb
 - app/models/stall/models/variant.rb
 - app/models/stall/models/variant_property_value.rb
@@ -407,6 +412,7 @@ files:
 - app/services/stall/payment_notification_service.rb
 - app/services/stall/product_list_staleness_handling_service.rb
 - app/services/stall/shipping_fee_calculator_service.rb
+- app/services/stall/shipping_notification_service.rb
 - app/views/admin/addresses/_fields.html.haml
 - app/views/admin/carts/_filters.html.haml
 - app/views/admin/carts/_form.html.haml
@@ -425,6 +431,8 @@ files:
 - app/views/checkout/steps/_shipping_method.html.haml
 - app/views/layouts/stall/application.html.erb
 - app/views/para/admin/resources/_variant_row.html.haml
+- app/views/para/stall/admin/shipping_notes/new.html.haml
+- app/views/para/stall/admin/shipping_notes/sent.html.haml
 - app/views/para/stall/inputs/_variant_select.html.haml
 - app/views/para/stall/inputs/_variants_matrix.html.haml
 - app/views/stall/addresses/_fields.html.haml
@@ -437,6 +445,7 @@ files:
 - app/views/stall/checkout/steps/show.html.haml
 - app/views/stall/credit_note_adjustments/_form.html.haml
 - app/views/stall/customer_mailer/order_paid_email.html.haml
+- app/views/stall/customer_mailer/order_shipped_email.html.haml
 - app/views/stall/customers/_fields.html.haml
 - app/views/stall/customers/_sign_in.html.haml
 - app/views/stall/line_items/_add_error.html.haml
@@ -446,6 +455,7 @@ files:
 - app/views/stall/payments/manual_payment_gateway/_form.html.haml
 - app/views/stall/shared/mailers/_address.html.haml
 - app/views/stall/shared/mailers/_cart.html.haml
+- app/views/stall/shared/mailers/_shipping_note.html.haml
 - app/views/stall/shipments/_fields.html.haml
 - config/locales/stall.en.yml
 - config/locales/stall.fr.yml
@@ -482,6 +492,10 @@ files:
 - db/migrate/20170202165514_create_stall_properties.rb
 - db/migrate/20170202165516_create_stall_property_values.rb
 - db/migrate/20170202165518_create_stall_variant_property_values.rb
+- db/migrate/20170206091211_add_name_to_stall_variants.rb
+- db/migrate/20170217142050_create_stall_manufacturers.rb
+- db/migrate/20170217143037_add_manufacturer_to_stall_products.rb
+- db/migrate/20170217153634_add_notification_email_sent_at_to_stall_shipments.rb
 - lib/generators/stall/checkout/step/step_generator.rb
 - lib/generators/stall/checkout/step/templates/step.html.haml.erb
 - lib/generators/stall/checkout/step/templates/step.rb.erb