spree_core 3.0.10 → 3.1.0.rc1

data/app/views/spree/shared/_error_messages.html.erb

@@ -1,6 +1,6 @@
 <% if target && target.errors.any? %>
   <div id="errorExplanation" class="errorExplanation" data-hook>
-    <h2><%= Spree.t(:errors_prohibited_this_record_from_being_saved, :count => target.errors.count) %>:</h2>
+    <h2><%= Spree.t(:errors_prohibited_this_record_from_being_saved, count: target.errors.size) %>:</h2>
     <p><%= Spree.t(:there_were_problems_with_the_following_fields) %>:</p>
      <ul>
      <% target.errors.full_messages.each do |msg| %>

data/app/views/spree/shared/_mailer_line_item.html.erb

@@ -0,0 +1,12 @@
+<tr>
+  <td class="six sub-columns">
+    <strong>
+      <%= link_to raw(line_item.variant.product.name), spree.product_url(line_item.variant.product) %>
+    </strong>
+    <%= raw(line_item.variant.options_text) -%>
+    (<%= line_item.variant.sku %>)
+  </td>
+  <td class="six sub-columns last right">
+    <%= line_item.quantity %> x <%= line_item.single_money %> = <%= line_item.display_amount %>
+  </td>
+</tr>

data/app/views/spree/shipment_mailer/shipped_email.html.erb

@@ -1,30 +1,37 @@
-<table>
+<table class="row header">
   <tr>
     <td>
       <p class="lede">
         <%= Spree.t('shipment_mailer.shipped_email.dear_customer') %>
       </p>
       <p>
-        <%= Spree.t('shipment_mailer.shipped_email.instructions') %>
+        <%= Spree.t('shipment_mailer.shipped_email.instructions', number: @shipment.order.number) %>
       </p>
       <p>
         <%= Spree.t('shipment_mailer.shipped_email.shipment_summary') %>
       </p>
-      <table>
-        <% @shipment.manifest.each do |item| %>
-          <tr>
-            <td><%= item.variant.sku %></td>
-            <td><%= item.variant.product.name %></td>
-            <td><%= item.variant.options_text %></td>
-          </tr>
-        <% end %>
+      <table class="container">
+        <tr>
+          <td class="wrapper last">
+            <table class="twelve columns">
+              <%= render collection: @shipment.manifest.map(&:line_item), partial: 'spree/shared/mailer_line_item', as: :line_item %>
+            </table>
+          </td>
+        </tr>
       </table>
       <p>
-        <%= Spree.t('shipment_mailer.shipped_email.track_information', :tracking => @shipment.tracking)     if @shipment.tracking %>
-      </p>
-      <p>
-        <%= Spree.t('shipment_mailer.shipped_email.track_link',        :url      => @shipment.tracking_url) if @shipment.tracking_url %>
+        <%= Spree.t('shipment_mailer.shipped_email.shipping_method', shipping_method: @shipment.shipping_method.name) %>
       </p>
+      <% if @shipment.tracking %>
+        <p>
+          <%= Spree.t('shipment_mailer.shipped_email.track_information', tracking: @shipment.tracking) %>
+        </p>
+      <% end %>
+      <% if @shipment.tracking_url %>
+        <p>
+          <%= Spree.t('shipment_mailer.shipped_email.track_link', url: link_to(@shipment.tracking_url, @shipment.tracking_url)).html_safe %>
+        </p>
+      <% end %>
       <p>
         <%= Spree.t('shipment_mailer.shipped_email.thanks') %>
       </p>

data/app/views/spree/shipment_mailer/shipped_email.text.erb

@@ -1,6 +1,6 @@
 <%= Spree.t('shipment_mailer.shipped_email.dear_customer') %>
 
-<%= Spree.t('shipment_mailer.shipped_email.instructions') %>
+<%= Spree.t('shipment_mailer.shipped_email.instructions', number: @shipment.order.number) %>
 
 ============================================================
 <%= Spree.t('shipment_mailer.shipped_email.shipment_summary') %>
@@ -10,7 +10,7 @@
 <% end %>
 ============================================================
 
-<%= Spree.t('shipment_mailer.shipped_email.track_information', :tracking => @shipment.tracking)     if @shipment.tracking %>
-<%= Spree.t('shipment_mailer.shipped_email.track_link',        :url      => @shipment.tracking_url) if @shipment.tracking_url %>
+<%= Spree.t('shipment_mailer.shipped_email.track_information', tracking: @shipment.tracking) if @shipment.tracking %>
+<%= Spree.t('shipment_mailer.shipped_email.track_link', url: @shipment.tracking_url) if @shipment.tracking_url %>
 
 <%= Spree.t('shipment_mailer.shipped_email.thanks') %>

data/config/initializers/user_class_extensions.rb

@@ -1,41 +1,10 @@
-Spree::Core::Engine.config.to_prepare do
-  if Spree.user_class
-    Spree.user_class.class_eval do
-
-      include Spree::UserApiAuthentication
-      include Spree::UserPaymentSource
-      include Spree::UserReporting
-
-      has_and_belongs_to_many :spree_roles,
-                              join_table: 'spree_roles_users',
-                              foreign_key: "user_id",
-                              class_name: "Spree::Role"
-
-      has_many :orders, foreign_key: :user_id, class_name: "Spree::Order"
-
-      belongs_to :ship_address, class_name: 'Spree::Address'
-      belongs_to :bill_address, class_name: 'Spree::Address'
+# Ensure that Spree.user_class includes the UserMethods concern
+# Previously these methods were injected automatically onto the class, which we
+# are still doing for compatability, but with a warning.
 
-      def self.ransackable_associations(auth_object=nil)
-        %w[bill_address ship_address]
-      end
-
-      def self.ransackable_attributes(auth_object=nil)
-        %w[id email]
-      end
-
-      # has_spree_role? simply needs to return true or false whether a user has a role or not.
-      def has_spree_role?(role_in_question)
-        spree_roles.where(name: role_in_question.to_s).any?
-      end
-
-      def last_incomplete_spree_order
-        orders.incomplete.order('created_at DESC').first
-      end
-
-      def analytics_id
-        id
-      end
-    end
+Spree::Core::Engine.config.to_prepare do
+  if Spree.user_class && !Spree.user_class.included_modules.include?(Spree::UserMethods)
+    ActiveSupport::Deprecation.warn "#{Spree.user_class} must include Spree::UserMethods"
+    Spree.user_class.include Spree::UserMethods
   end
 end

data/config/locales/en.yml

@@ -77,6 +77,7 @@ en:
         name: Name
       spree/product:
         available_on: Available On
+        discontinue_on: Discontinue On
         cost_currency: Cost Currency
         cost_price: Cost Price
         description: Description
@@ -126,6 +127,10 @@ en:
         seo_title: Seo Title
         name: Site Name
         mail_from_address: Mail From Address
+      spree/store_credit:
+        amount_used: "Amount used"
+      spree/store_credit_category:
+        name: Name
       spree/tax_category:
         description: Description
         name: Name
@@ -246,6 +251,12 @@ en:
       spree/stock_transfer:
         one: Stock Transfer
         other: Stock Transfers
+      spree/store_credit:
+        one: Store Credit
+        other: Store Credits
+      spree/store_credit_category:
+        one: Store Credit Category
+        other: Store Credit Categories
       spree/tax_category:
         one: Tax Category
         other: Tax Categories
@@ -312,11 +323,25 @@ en:
               cannot_be_associated_unless_accepted: cannot be associated to a return item that is not accepted.
             inventory_unit:
               other_completed_return_item_exists: "%{inventory_unit_id} has already been taken by return item %{return_item_id}"
+        spree/shipping_method:
+          attributes:
+            base:
+              required_shipping_category: "You must select at least one shipping category"
         spree/store:
           attributes:
             base:
               cannot_destroy_default_store: Cannot destroy the default Store.
-
+        spree/store_credit:
+          attributes:
+            amount_used:
+              cannot_be_greater_than_amount: Cannot be greater than amount.
+              greater_than_zero_restrict_delete: is greater than zero. Can not delete store credit.
+            amount_authorized:
+              exceeds_total_credits: Exceeds total credits.
+        spree/variant:
+          attributes:
+            base:
+              cannot_destroy_if_attached_to_line_items: Cannot delete variants once they are attached to line items.
 
   devise:
     confirmations:
@@ -356,6 +381,7 @@ en:
     user_sessions:
       signed_in: Signed in successfully.
       signed_out: Signed out successfully.
+
   errors:
     messages:
       already_confirmed: was already confirmed
@@ -364,6 +390,12 @@ en:
       not_saved:
         one: ! '1 error prohibited this %{resource} from being saved:'
         other: ! '%{count} errors prohibited this %{resource} from being saved:'
+
+  number:
+    percentage:
+      format:
+        precision: 1
+
   spree:
     abbreviation: Abbreviation
     accept: Accept
@@ -402,6 +434,7 @@ en:
     add_stock: Add Stock
     add_to_cart: Add To Cart
     add_variant: Add Variant
+    add_store_credit: Add Store Credit
     additional_item: Additional Item
     address: Address
     address1: Address
@@ -409,6 +442,10 @@ en:
     adjustable: Adjustable
     adjustment: Adjustment
     adjustment_amount: Amount
+    adjustment_labels:
+      tax_rates:
+        including_tax: '%{name}%{amount} (Included in Price)'
+        excluding_tax: '%{name}%{amount}'
     adjustment_successfully_closed: Adjustment has been successfully closed!
     adjustment_successfully_opened: Adjustment has been successfully opened!
     adjustment_total: Adjustment Total
@@ -428,6 +465,12 @@ en:
         taxonomies: Taxonomies
         taxons: Taxons
         users: Users
+      order:
+        events:
+          approve: approve
+          cancel: cancel
+          resume: resume
+          resend: Resend
       user:
         account: Account
         addresses: Addresses
@@ -437,6 +480,9 @@ en:
         order_num: "Order #"
         orders: Orders
         user_information: User Information
+        store_credits: Store Credits
+        no_store_credit: User has no Store Credit available.
+        available_store_credit: User has %{amount} in Store Credit available.
     administration: Administration
     advertise: Advertise
     agree_to_privacy_policy: Agree to Privacy Policy
@@ -469,6 +515,7 @@ en:
     authorized: Authorized
     auto_capture: Auto Capture
     available_on: Available On
+    available: Available
     average_order_value: Average Order Value
     avs_response: AVS Response
     back: Back
@@ -493,8 +540,10 @@ en:
     calculator: Calculator
     calculator_settings_warning: If you are changing the calculator type, you must save first before you can edit the calculator settings
     cancel: cancel
+    canceled: Canceled
     canceler: Canceler
     canceled_at: Canceled at
+    cannot_empty_completed_order: Order has already been processed so it cannot be emptied
     cannot_create_payment_without_payment_methods: You cannot create a payment for an order without any payment methods defined.
     cannot_create_customer_returns: Cannot create customer returns as this order has no shipped units.
     cannot_create_returns: Cannot create returns as this order has no shipped units.
@@ -567,11 +616,13 @@ en:
     create_new_order: Create new order
     create_reimbursement: Create reimbursement
     created_at: Created At
+    created_by: Created By
     credit: Credit
-    credits: Credits
     credit_card: Credit Card
     credit_cards: Credit Cards
     credit_owed: Credit Owed
+    credited: Credited
+    credits: Credits
     currency: Currency
     currency_settings: Currency Settings
     current: Current
@@ -602,12 +653,14 @@ en:
       js_format: yy/mm/dd
     date_range: Date Range
     default: Default
+    default_country_cannot_be_deleted: Default country cannot be deleted
     default_refund_amount: Default Refund Amount
     default_tax: Default Tax
     default_tax_zone: Default Tax Zone
     delete: Delete
+    deleted: Deleted
     delete_from_taxon: Delete From Taxon
-    deleted_variants_present: Some line items in this order have products that are no longer available.
+    discontinued_variants_present: Some line items in this order have products that are no longer available.
     delivery: Delivery
     depth: Depth
     details: Details
@@ -616,6 +669,7 @@ en:
     destroy: Destroy
     discount_amount: Discount Amount
     discontinue_on: Discontinue On
+    discontinued: Discontinued
     dismiss_banner: No. Thanks! I'm not interested, do not display this message again
     display: Display
     doesnt_track_inventory: It doesn't track inventory
@@ -746,6 +800,7 @@ en:
     inventory_state: Inventory State
     is_not_available_to_shipment_address: is not available to shipment address
     iso_name: Iso Name
+    issued_on: Issued On
     item: Item
     item_description: Item Description
     item_total: Item Total
@@ -838,6 +893,8 @@ en:
     new_stock_location: New Stock Location
     new_stock_movement: New Stock Movement
     new_stock_transfer: New Stock Transfer
+    new_store_credit: New Store Credit
+    new_store_credit_category: New Store Credit Category
     new_tax_category: New Tax Category
     new_tax_rate: New Tax Rate
     new_taxon: New Taxon
@@ -848,6 +905,7 @@ en:
     new_zone: New Zone
     next: Next
     no_actions_added: No actions added
+    no_available_date_set: No available date set
     no_payment_found: No payment found
     no_pending_payments: No pending payments
     no_products_found: No products found
@@ -858,6 +916,7 @@ en:
     no_shipping_method_selected: No shipping method selected.
     no_state_changes: No state changes yet.
     no_tracking_present: No tracking details provided.
+    user_not_found: User not found
     none: None
     none_selected: None Selected
     normal_amount: Normal Amount
@@ -874,6 +933,7 @@ en:
       variant_deleted: Variant has been deleted
       variant_not_deleted: Variant could not be deleted
     num_orders: "# Orders"
+    number: Number
     on_hand: On Hand
     open: Open
     open_all_adjustments: Open All Adjustments
@@ -896,21 +956,19 @@ en:
     order_information: Order Information
     order_line_items: Order Line Items
     order_mailer:
+      subtotal: ! 'Subtotal:'
+      total: ! 'Order Total:'
       cancel_email:
         dear_customer: Dear Customer,
         instructions: Your order has been CANCELED.  Please retain this cancellation information for your records.
-        order_summary_canceled: Order Summary [CANCELED]
+        order_summary_canceled: Order %{number} Summary [CANCELED]
         subject: Cancellation of Order
-        subtotal: ! 'Subtotal:'
-        total: ! 'Order Total:'
       confirm_email:
         dear_customer: Dear Customer,
         instructions: Please review and retain the following order information for your records.
-        order_summary: Order Summary
+        order_summary: Order %{number} Summary
         subject: Order Confirmation
-        subtotal: ! 'Subtotal:'
         thanks: Thank you for your business.
-        total: ! 'Order Total:'
     order_not_found: We couldn't find your order. Please try that action again.
     order_number: Order %{number}
     order_processed_successfully: Your order has been processed successfully
@@ -969,6 +1027,7 @@ en:
     percent_per_item: Percent Per Item
     permalink: Permalink
     pending: Pending
+    pending_sale: Pending Sale
     phone: Phone
     place_order: Place Order
     please_define_payment_methods: Please define some payment methods first.
@@ -1023,6 +1082,7 @@ en:
       match_policies:
         all: Match all of these rules
         any: Match any of these rules
+    promotion_label: 'Promotion (%{name})'
     promotion_rule: Promotion Rule
     promotion_rule_types:
       first_order:
@@ -1099,14 +1159,17 @@ en:
     report: Report
     reports: Reports
     resellable: Resellable
-    resend: Resend
     reset_password: Reset my password
     response_code: Response Code
     resume: resume
     resumed: Resumed
     return: return
+    returns: Returns
     return_authorization: Return Authorization
     return_authorization_reasons: Return Authorization Reasons
+    return_authorization_states:
+      authorized: Authorized
+      canceled: Canceled
     return_authorization_updated: Return authorization updated
     return_authorizations: Return Authorizations
     return_item_inventory_unit_ineligible: Return item's inventory unit must be shipped
@@ -1157,6 +1220,7 @@ en:
     select_from_prototype: Select From Prototype
     select_a_return_authorization_reason: Select a reason for the return authorization
     select_a_stock_location: Select a stock location
+    select_a_store_credit_reason: Select a reason for the store credit
     select_stock: Select stock
     selected_quantity_not_available: ! 'selected of %{item} is not available.'
     send_copy_of_all_mails_to: Send Copy of All Mails To
@@ -1173,12 +1237,13 @@ en:
     shipment_mailer:
       shipped_email:
         dear_customer: Dear Customer,
-        instructions: Your order has been shipped
-        shipment_summary: Shipment Summary
+        instructions: Your order %{number} has been shipped
+        shipment_summary: Shipment Summary for order
+        shipping_method: "Shipping method: %{shipping_method}"
         subject: Shipment Notification
         thanks: Thank you for your business.
         track_information: ! 'Tracking Information: %{tracking}'
-        track_link: ! 'Tracking Link: %{url}'
+        track_link: "Tracking Link: %{url}"
     shipment_state: Shipment State
     shipment_states:
       backorder: backorder
@@ -1202,12 +1267,17 @@ en:
     shipping_method: Shipping Method
     shipping_methods: Shipping Methods
     shipping_price_sack: Price sack
+    shipping_rates:
+      display_price:
+        including_tax: "%{price} (incl. %{tax_amount} %{tax_rate_name})"
+        excluding_tax: "%{price} (+ %{tax_amount} %{tax_rate_name})"
     shipping_total: Shipping total
     shop_by_taxonomy: Shop by %{taxonomy}
     shopping_cart: Shopping Cart
     show: Show
     show_active: Show Active
     show_deleted: Show Deleted
+    show_discontinued: Show Discontinued
     show_only_complete_orders: Only show complete orders
     show_only_considered_risky: Only show risky orders
     show_rate_in_label: Show rate in label
@@ -1272,6 +1342,35 @@ en:
     stock_transfers: Stock Transfers
     stop: Stop
     store: Store
+    store_credit_name: Store Credit
+    store_credit:
+      credit: "Credit"
+      authorized: "Authorized"
+      captured: "Used"
+      allocated: "Added"
+      apply: Apply Store Credit
+      applicable_amount: "%{amount} in store credit will be applied to this order."
+      available_amount: "You have %{amount} in Store Credit available!"
+      remaining_amount: "You have %{amount} remaining in your account\'s Store Credit."
+      additional_payment_needed: Select another payment method for the remaining %{amount}.
+      errors:
+        cannot_change_used_store_credit: You cannot change a store credit that has already been used
+        unable_to_create: Unable to create store credit
+        unable_to_delete: Unable to delete store credit
+        unable_to_fund: Unable to pay for order using store credits
+        unable_to_update: Unable to update store credit
+    store_credit_categories: Store Credit Categories
+    store_credit_payment_method:
+      unable_to_void: "Unable to void code: %{auth_code}"
+      unable_to_credit: "Unable to credit code: %{auth_code}"
+      successful_action: "Successful store credit %{action}"
+      unable_to_find: "Could not find store credit"
+      insufficient_funds: "Store credit amount remaining is not sufficient"
+      currency_mismatch: "Store credit currency does not match order currency"
+      insufficient_authorized_amount: "Unable to capture more than authorized amount"
+      unable_to_find_for_action: "Could not find store credit for auth code: %{auth_code} for action: %{action}"
+      user_has_no_store_credits: "User does not have any available store credit"
+      select_one_store_credit: "Select store credit to go towards remaining balance"
     street_address: Street Address
     street_address_2: Street Address (cont'd)
     subtotal: Subtotal
@@ -1353,6 +1452,7 @@ en:
     use_new_cc: Use a new card
     use_new_cc_or_payment_method: Use a new card / payment method
     use_s3: Use Amazon S3 For Images
+    used: Used
     user: User
     user_rule:
       choose_users: Choose users