solidus_address_book 1.0.0

data/app/models/concerns/solidus_address_book/address.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+require 'discard'
+
+module SolidusAddressBook
+  module Address
+    extend ActiveSupport::Concern
+
+    included do
+      belongs_to :user, class_name: Spree.user_class.to_s
+
+      include Discard::Model
+      self.discard_column = :deleted_at
+
+      scope :with_deleted, -> { where.not(deleted_at: nil) }
+    end
+  end
+end

data/app/models/concerns/solidus_address_book/permitted_attributes_concern.rb

@@ -0,0 +1,11 @@
+module SolidusAddressBook
+  module PermittedAttributesConcern
+    def address_attributes
+      super | [:label]
+    end
+
+    def checkout_attributes
+      super | [:bill_address_id, :ship_address_id]
+    end
+  end
+end

data/app/models/permitted_attributes_decorator.rb

@@ -0,0 +1 @@
+Spree::PermittedAttributes.singleton_class.prepend SolidusAddressBook::PermittedAttributesConcern

data/app/models/spree/address_ability.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+class Spree::AddressAbility
+  include CanCan::Ability
+
+  def initialize(user)
+    can :manage, Spree::Address do |address|
+      address.user == user
+    end
+
+    can :create, Spree::Address do |_address|
+      user.id.present?
+    end
+  end
+end

data/app/models/spree/address_decorator.rb

@@ -0,0 +1,83 @@
+# frozen_string_literal: true
+
+require 'discard'
+
+module AddressDecorator
+  extend ActiveSupport::Concern
+
+  included do
+    prepend(InstanceMethods)
+
+    include Discard::Model
+    self.discard_column = :deleted_at
+
+    def self.required_fields
+      Spree::Address.validators.map do |v|
+        v.kind_of?(ActiveModel::Validations::PresenceValidator) ? v.attributes : []
+      end.flatten
+    end
+
+    def self.default(user = nil, kind = 'bill')
+      if user && user_address = user.public_send(:"#{kind}_address")
+        user_address.clone
+      else
+        build_default
+      end
+    end
+  end
+
+  module InstanceMethods
+    # TODO: look into if this is actually needed. I don't want to override methods unless it is really needed
+    # can modify an address if it's not been used in an order
+    def same_as?(other)
+      return false if other.nil?
+
+      attributes.except('id', 'updated_at', 'created_at', 'user_id') == other.attributes.except('id', 'updated_at', 'created_at', 'user_id')
+    end
+
+    # can modify an address if it's not been used in an completed order
+    def editable?
+      new_record? || (Spree::Order.complete.where("bill_address_id = ? OR
+                                                   ship_address_id = ? AND
+                                                   state != 'complete' AND
+                                                   shipment_state != 'shipped'", id, id).count == 0)
+    end
+
+    def can_be_deleted?
+      Spree::Order.where("bill_address_id = ? OR
+                          ship_address_id = ? AND
+                          state != 'complete' AND
+                          shipment_state != 'shipped'", id, id).count == 0
+    end
+
+    def to_s
+      [
+        full_name,
+        company.to_s,
+        address1.to_s,
+        address2.to_s,
+        "#{city}, #{state ? state.abbr : state_name} #{zipcode}",
+        country.to_s
+      ].reject(&:empty?).join("<br/>").html_safe
+    end
+
+    # Remove readonly validation to be able to modify addresses over the flow
+    def readonly?
+      false
+    end
+
+    # Use discard ability to not affect order created previously
+    def destroy
+      can_be_deleted? ? delete : discard
+    end
+
+    def check
+      attrs = attributes.except('id', 'updated_at', 'created_at')
+      the_same_address = user.addresses.where(attrs).first
+      the_same_address || self
+    end
+  end
+end
+
+Spree::Address.include(SolidusAddressBook::Address)
+Spree::Address.include(AddressDecorator)

data/app/models/spree/order_decorator.rb

@@ -0,0 +1,109 @@
+# frozen_string_literal: true
+
+module OrderDecorator
+  extend ActiveSupport::Concern
+
+  included do
+    prepend(InstanceMethods)
+    before_validation :clone_shipping_address
+  end
+
+  module InstanceMethods
+    def clone_shipping_address
+      return unless SolidusAddressBook::Config[:disable_bill_address]
+
+      bill_address = ship_address if ship_address
+
+      true
+    end
+
+    def clone_billing_address
+      if bill_address
+        ship_address = bill_address
+      end
+      true
+    end
+
+    def bill_address_id=(id)
+      address = Spree::Address.where(id: id).first
+
+      if address && address.user_id == user_id
+        self["bill_address_id"] = address.id
+        user.update_attribute(:bill_address_id, address.id)
+        bill_address.reload
+      else
+        self["bill_address_id"] = nil
+      end
+    end
+
+    def bill_address_attributes=(attributes)
+      bill_address = update_or_create_address(attributes)
+      user.bill_address = bill_address if user
+    end
+
+    def ship_address_id=(id)
+      address = Spree::Address.where(id: id).first
+
+      if address && address.user_id == user_id
+        self["ship_address_id"] = address.id
+        user.update_attribute(:ship_address_id, address.id)
+        ship_address.reload
+      else
+        self["ship_address_id"] = nil
+      end
+    end
+
+    def ship_address_attributes=(attributes)
+      ship_address = update_or_create_address(attributes)
+      user.ship_address = ship_address if user
+    end
+
+    def assign_default_addresses!
+      if user
+        bill_address = user.bill_address if !bill_address_id && user.bill_address.try(:valid?)
+        # Skip setting ship address if order doesn't have a delivery checkout step
+        # to avoid triggering validations on shipping address
+        ship_address = user.ship_address if !ship_address_id && user.ship_address.try(:valid?) && checkout_steps.include?("delivery")
+      end
+    end
+
+    private
+
+    def update_addresses_params
+      bill_address_attributes = @updating_params["order"].delete("bill_address_attributes")
+      bill_address_id = @updating_params["order"].delete("bill_address_id")
+      ship_address_attributes = @updating_params["order"].delete("ship_address_attributes")
+      ship_address_id = @updating_params["order"].delete("ship_address_id")
+    end
+
+    def update_or_create_address(attributes = {})
+      return if attributes.blank?
+
+      if user
+        address = user.addresses.build(attributes.except(:id)).check
+        return address if address.id
+      end
+
+      if attributes[:id]
+        address = Spree::Address.find(attributes[:id])
+        attributes.delete(:id)
+
+        if address&.editable?
+          address.update_attributes(attributes)
+          return address
+        else
+          attributes.delete(:id)
+        end
+      end
+
+      if !attributes[:id]
+        address = Spree::Address.new(attributes)
+        address.save
+      end
+
+      address
+    end
+  end
+end
+
+Spree::Order.include(OrderDecorator)

data/app/models/spree/user_decorator.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+module UserDecorator
+  extend ActiveSupport::Concern
+
+  included do
+    has_many :addresses, class_name: 'Spree::Address'
+  end
+end
+
+Spree.user_class.include(UserDecorator)

data/app/overrides/add_address_book_to_my_account.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+Deface::Override.new(
+  virtual_path: 'spree/users/show',
+  name: 'address_book_account_my_orders',
+  insert_after: "[data-hook='account_my_orders']",
+  partial: 'spree/users/addresses',
+  disabled: false
+)

data/app/views/spree/addresses/_form.html.erb

@@ -0,0 +1,114 @@
+<% address_id = address_type.chars.first %>
+
+<div class="inner" data-hook=<%="#{address_type}_inner" %>>
+  <div class="field" id=<%="#{address_id}label" %>>
+    <%= address_form.label :label, t('spree.label') %>
+    <%= address_form.text_field :label, class: 'required', autocomplete: address_type + ' label', autofocus: true, placeholder: t('spree.placeholder.address.label') %>
+  </div>
+
+  <div class="field field-required" id=<%="#{address_id}firstname" %>>
+    <%= address_form.label :firstname, t('spree.first_name') %>
+    <%= address_form.text_field :firstname, class: 'required', autocomplete: address_type + ' given-name', required: true %>
+  </div>
+
+  <div class="field" id=<%="#{address_id}lastname" %>>
+    <%= address_form.label :lastname, t('spree.last_name') %>
+    <%= address_form.text_field :lastname, autocomplete: address_type + ' family-name' %>
+  </div>
+
+  <% if Spree::Config[:company] %>
+    <div class="field" id=<%="#{address_id}company" %>>
+      <%= address_form.label :company, t('spree.company') %>
+      <%= address_form.text_field :company, autocomplete: address_type + ' organization' %>
+    </div>
+  <% end %>
+
+  <div class="field field-required" id=<%="#{address_id}address1" %>>
+    <%= address_form.label :address1, t('spree.street_address') %>
+    <%= address_form.text_field :address1, class: 'required', autocomplete: address_type + ' address-line1',  required: true %>
+  </div>
+
+  <div class="field" id=<%="#{address_id}address2" %>>
+    <%= address_form.label :address2, I18n.t('spree.street_address_2') %>
+    <%= address_form.text_field :address2, autocomplete: address_type + ' address-line2' %>
+  </div>
+
+  <div class="field field-required" id=<%="#{address_id}city" %>>
+    <%= address_form.label :city, t('spree.city') %>
+    <%= address_form.text_field :city, class: 'required', autocomplete: address_type + ' address-level2',  required: true %>
+  </div>
+
+  <div class="field field-required" id=<%="#{address_id}country" %>>
+    <%= address_form.label :country_id, t('spree.country') %>
+    <span id=<%="#{address_id}country-selection" %>>
+      <%= address_form.collection_select :country_id, available_countries, :id, :name, {},
+          class: 'required',
+          autocomplete: address_type + ' country-name',
+          required: true
+        %>
+    </span>
+  </div>
+
+  <% if Spree::Config[:address_requires_state] %>
+    <div class="field field-required" id=<%="#{address_id}state" %>>
+      <% have_states = !address.country.states.empty? %>
+      <%= address_form.label :state, t('spree.state') %>
+
+      <span class="js-address-fields" style="display: none;">
+        <%=
+          address_form.collection_select(
+            :state_id, address.country.states, :id, :name,
+            {include_blank: true},
+            {
+              class: have_states ? 'required' : '',
+              style: have_states ? '' : 'display: none;',
+              disabled: !have_states,
+              autocomplete: address_type + ' address-level1',
+            })
+          %>
+        <%=
+          address_form.text_field(
+            :state_name,
+            class: !have_states ? 'required' : '',
+            style: have_states ? 'display: none;' : '',
+            disabled: have_states,
+            autocomplete: address_type + ' address-level1',
+          )
+        %>
+      </span>
+
+      <noscript>
+        <%= address_form.text_field :state_name, class: 'required', autocomplete: address_type + ' address-level1',  required: true %>
+      </noscript>
+    </div>
+  <% end %>
+
+  <div class="field <%= 'field-required' if address.require_zipcode? %>" id=<%="#{address_id}zipcode" %>>
+    <%= address_form.label :zipcode, t('spree.zip') %>
+    <%= address_form.text_field :zipcode, class: "#{'required' if address.require_zipcode?}", autocomplete: address_type + ' postal-code',  required: true %>
+  </div>
+
+  <div class="field <%= 'field-required' if address.require_phone? %>" id=<%="#{address_id}phone" %>>
+    <%= address_form.label :phone, t('spree.phone') %>
+    <% phone_hash = address.require_phone? ? { class: 'required', required: true } : {} %>
+    <%= address_form.phone_field :phone, phone_hash.merge({ autocomplete: address_type + ' home tel' }) %>
+  </div>
+
+  <% if Spree::Config[:alternative_shipping_phone] %>
+    <div class="field" id=<%="#{address_id}altphone" %>>
+      <%= address_form.label :alternative_phone, t('spree.alternative_phone') %>
+      <%= address_form.phone_field :alternative_phone, autocomplete: address_type + ' tel'%>
+    </div>
+  <% end %>
+
+  <% if params[:controller] == 'spree/checkout' %>
+    <div class="field" id=<%="#{address_id}save" %>>
+      <p class="field checkbox"  data-hook="save_user_address">
+        <%= label_tag :save_user_address, id: 'save_user_address' do %>
+          <%= check_box_tag 'save_user_address', '1' %>
+          <%= t('spree.save_address') %>
+        <% end %>
+      </p>
+    </div>
+  <% end %>
+</div>

data/app/views/spree/addresses/destroy.js.erb

@@ -0,0 +1,2 @@
+$("#billing_address_<%= @address.id %>").fadeOut();
+$("#shipping_address_<%= @address.id %>").fadeOut();

data/app/views/spree/addresses/edit.html.erb

@@ -0,0 +1,29 @@
+<div class="col-md-6 col-md-offset-3">
+  <div class="panel panel-default">
+    <div class="panel-heading">
+      <h3 class="panel-title"><%= t(:edit_shipping_address, scope: :spree) %></h3>
+    </div>
+
+    <div class="panel-body">
+      <%= render 'spree/shared/error_messages', target: @address %>
+
+      <%= form_for @address, html: { id: 'checkout_form_address' } do |f| %>
+        <fieldset>
+          <div class="inner">
+            <%= render 'spree/addresses/form',
+              address_name: 'address',
+              address_form: f,
+              address_type: 'shipping',
+              address: @address
+            %>
+          </div>
+
+          <%= f.submit t('spree.update'), class: 'btn btn-primary' %>
+          <% if try_spree_current_user && respond_to?(:account_path) %>
+            <%= link_to t('spree.back_to_my_account'), spree.account_path, class: 'btn btn-primary' %>
+          <% end %>
+        </fieldset>
+      <% end %>
+    </div>
+  </div>
+</div>

data/app/views/spree/addresses/new.html.erb

@@ -0,0 +1,29 @@
+<div class="col-md-6 col-md-offset-3">
+  <div class="panel panel-default">
+    <div class="panel-heading">
+      <h3 class="panel-title"><%= t(:new_shipping_address, scope: :spree) %></h3>
+    </div>
+
+    <div class="panel-body">
+      <%= render 'spree/shared/error_messages', target: @address %>
+
+      <%= form_for @address, html: { id: 'checkout_form_address' } do |f| %>
+        <fieldset>
+          <div class="inner">
+            <%= render 'spree/addresses/form',
+              address_name: 'address',
+              address_form: f,
+              address_type: 'shipping',
+              address: @address
+            %>
+          </div>
+
+          <%= f.submit t('spree.save'), class: 'btn btn-primary' %>
+          <% if try_spree_current_user && respond_to?(:account_path) %>
+            <%= link_to t('spree.back_to_my_account'), spree.account_path, class: 'btn btn-primary' %>
+          <% end %>
+        </fieldset>
+      <% end %>
+    </div>
+  </div>
+</div>