spree_core 2.4.10 → 3.0.0.rc1

data/config/initializers/user_class_extensions.rb

@@ -15,14 +15,6 @@ Spree::Core::Engine.config.to_prepare do
       belongs_to :ship_address, class_name: 'Spree::Address'
       belongs_to :bill_address, class_name: 'Spree::Address'
 
-      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?
@@ -31,10 +23,6 @@ Spree::Core::Engine.config.to_prepare do
       def last_incomplete_spree_order
         spree_orders.incomplete.order('created_at DESC').first
       end
-
-      def analytics_id
-        id
-      end
     end
   end
 end

data/config/locales/en.yml

@@ -72,6 +72,7 @@ en:
         zipcode: Shipping address zipcode
       spree/payment:
         amount: Amount
+        number: Number
       spree/payment_method:
         name: Name
       spree/product:
@@ -105,9 +106,19 @@ en:
         amount: Amount
       spree/role:
         name: Name
+      spree/shipment:
+        number: Number
       spree/state:
         abbr: Abbreviation
         name: Name
+      spree/state_change:
+        state_changes: State changes
+        type: Type
+        state_from: State from
+        state_to: State to
+        user: User
+        timestamp: Timestamp
+        updated: Updated
       spree/store:
         url: Site URL
         meta_description: Meta Description
@@ -223,6 +234,9 @@ en:
       spree/state:
         one: State
         other: States
+      spree/state_change:
+        one: State Change
+        other: State Changes
       spree/stock_movement:
         one: Stock Movement
         other: Stock Movements
@@ -423,6 +437,7 @@ en:
         orders: Orders
         user_information: User Information
     administration: Administration
+    advertise: Advertise
     agree_to_privacy_policy: Agree to Privacy Policy
     agree_to_terms_of_service: Agree to Terms of Service
     all: All
@@ -430,9 +445,6 @@ en:
     all_adjustments_opened: All adjustments successfully opened!
     all_departments: All departments
     all_items_have_been_returned: All items have been returned
-    allow_ssl_in_development_and_test: Allow SSL to be used when in development and test modes
-    allow_ssl_in_production: Allow SSL to be used in production mode
-    allow_ssl_in_staging: Allow SSL to be used in staging mode
     already_signed_up_for_analytics: You have already signed up for Spree Analytics
     alt_text: Alternative Text
     alternative_phone: Alternative Phone
@@ -460,37 +472,11 @@ en:
     back: Back
     back_end: Backend
     backordered: Backordered
-    back_to_adjustments_list: Back To Adjustments List
-    back_to_customer_return: Back To Customer Return
-    back_to_customer_return_list: Back To Customer Return List
-    back_to_images_list: Back To Images List
-    back_to_option_types_list: Back To Option Types List
-    back_to_orders_list: Back To Orders List
+    back_to_resource_list: 'Back To %{resource} List'
     back_to_payment: Back To Payment
-    back_to_payment_methods_list: Back To Payment Methods List
-    back_to_payments_list: Back To Payments List
-    back_to_products_list: Back To Products List
-    back_to_promotions_list: Back To Promotions List
-    back_to_promotion_categories_list: Back To Promotions Categories List
-    back_to_properties_list: Back To Properties List
-    back_to_prototypes_list: Back To Prototypes List
-    back_to_reports_list: Back To Reports List
-    back_to_refund_reason_list: Back To Refund Reason List
-    back_to_reimbursement_type_list: Back To Reimbursement Type List
     back_to_rma_reason_list: Back To RMA Reason List
-    back_to_shipping_categories: Back To Shipping Categories
-    back_to_shipping_categories_list: Back To Shipping Categories List
-    back_to_shipping_methods_list: Back To Shipping Methods List
-    back_to_states_list: Back To States List
-    back_to_stock_locations_list: Back to Stock Locations List
-    back_to_stock_movements_list: Back to Stock Movements List
-    back_to_stock_transfers_list: Back to Stock Transfers List
     back_to_store: Go Back To Store
-    back_to_tax_categories_list: Back To Tax Categories List
-    back_to_taxonomies_list: Back To Taxonomies List
-    back_to_trackers_list: Back To Trackers List
     back_to_users_list: Back To Users List
-    back_to_zones_list: Back To Zones List
     backorderable: Backorderable
     backorderable_default: Backorderable default
     backorders_allowed: backorders allowed
@@ -575,8 +561,6 @@ en:
     coupon_code_not_eligible: This coupon code is not eligible for this order
     coupon_code_not_found: The coupon code you entered doesn't exist. Please try again.
     coupon_code_unknown_error: This coupon code could not be applied to the cart at this time.
-    customer_return: Customer Return
-    customer_returns: Customer Returns
     create: Create
     create_a_new_account: Create a new account
     create_new_order: Create new order
@@ -588,15 +572,14 @@ en:
     credit_cards: Credit Cards
     credit_owed: Credit Owed
     currency: Currency
-    currency_decimal_mark: Currency decimal mark
     currency_settings: Currency Settings
-    currency_symbol_position: Put currency symbol before or after dollar amount?
-    currency_thousands_separator: Currency thousands separator
     current: Current
     current_promotion_usage: ! 'Current Usage: %{count}'
     customer: Customer
     customer_details: Customer Details
     customer_details_updated: Customer Details Updated
+    customer_return: Customer Return
+    customer_returns: Customer Returns
     customer_search: Customer Search
     cut: Cut
     cvv_response: CVV Response
@@ -625,37 +608,18 @@ en:
     deleted_variants_present: Some line items in this order have products that are no longer available.
     delivery: Delivery
     depth: Depth
+    details: Details
     description: Description
     destination: Destination
     destroy: Destroy
     discount_amount: Discount Amount
     dismiss_banner: No. Thanks! I'm not interested, do not display this message again
     display: Display
-    display_currency: Display currency
+    doesnt_track_inventory: It doesnt track inventory
     edit: Edit
-    editing_country: Editing Country
-    editing_option_type: Editing Option Type
-    editing_payment_method: Editing Payment Method
-    editing_product: Editing Product
-    editing_promotion: Editing Promotion
-    editing_promotion_category: Editing Promotion Category
-    editing_property: Editing Property
-    editing_prototype: Editing Prototype
-    edit_refund_reason: Edit Refund Reason
-    editing_refund_reason: Editing Refund Reason
-    editing_reimbursement: Editing Reimbursement
-    editing_reimbursement_type: Editing Reimbursement Type
+    editing_resource: 'Editing %{resource}'
     editing_rma_reason: Editing RMA Reason
-    editing_shipping_category: Editing Shipping Category
-    editing_shipping_method: Editing Shipping Method
-    editing_state: Editing State
-    editing_stock_location: Editing Stock Location
-    editing_stock_movement: Editing Stock Movement
-    editing_tax_category: Editing Tax Category
-    editing_tax_rate: Editing Tax Rate
-    editing_tracker: Editing Tracker
     editing_user: Editing User
-    editing_zone: Editing Zone
     eligibility_errors:
       messages:
         has_excluded_product: Your cart contains a product that prevents this coupon code from being applied.
@@ -677,12 +641,10 @@ en:
     enable_mail_delivery: Enable Mail Delivery
     end: End
     ending_in: Ending in
-    environment: Environment
     error: error
     errors:
       messages:
         could_not_create_taxon: Could not create taxon
-        no_payment_methods_available: No payment methods are configured for this environment
         no_shipping_methods_available: No shipping methods available for selected location, please change your address and try again.
     errors_prohibited_this_record_from_being_saved:
       one: 1 error prohibited this record from being saved
@@ -712,6 +674,7 @@ en:
     failed_payment_attempts: Failed Payment Attempts
     filename: Filename
     fill_in_customer_info: Please fill in customer info
+    filter: Filter
     filter_results: Filter Results
     finalize: Finalize
     find_a_taxon: Find a Taxon
@@ -727,7 +690,6 @@ en:
     free_shipping_amount: "-"
     front_end: Front End
     gateway: Gateway
-    gateway_config_unavailable: Gateway unavailable for environment
     gateway_error: Gateway Error
     general: General
     general_settings: General Settings
@@ -737,7 +699,6 @@ en:
     guest_user_account: Checkout as a Guest
     has_no_shipped_units: has no shipped units
     height: Height
-    hide_cents: Hide cents
     home: Home
     i18n:
       available_locales: Available Locales
@@ -752,7 +713,6 @@ en:
       this_file_language: English (US)
       translations: Translations
     icon: Icon
-    identifier: Identifier
     image: Image
     images: Images
     implement_eligible_for_return: "Must implement #eligible_for_return? for your EligibilityValidator."
@@ -773,6 +733,7 @@ en:
     intercept_email_instructions: Override email recipient and replace with this address.
     internal_name: Internal Name
     invalid_credit_card: Invalid credit card.
+    invalid_exchange_variant: Invalid exchange variant.
     invalid_payment_provider: Invalid payment provider.
     invalid_promotion_action: Invalid promotion action.
     invalid_promotion_rule: Invalid promotion rule.
@@ -804,12 +765,6 @@ en:
     lifetime_stats: Lifetime Stats
     line_item_adjustments: "Line item adjustments"
     list: List
-    listing_countries: Listing Countries
-    listing_orders: Listing Orders
-    listing_products: Listing Products
-    listing_reports: Listing Reports
-    listing_tax_categories: Listing Tax Categories
-    listing_users: Listing Users
     loading: Loading
     locale_changed: Locale Changed
     location: Location
@@ -842,7 +797,6 @@ en:
     meta_title: Meta Title
     metadata: Metadata
     minimal_amount: Minimal Amount
-    missing_return_authorization: ! 'Missing Return Authorization for %{item_name}.'
     month: Month
     more: More
     move_stock_between_locations: Move Stock Between Locations
@@ -888,20 +842,15 @@ en:
     new_zone: New Zone
     next: Next
     no_actions_added: No actions added
-    no_images_found: No images found
-    no_orders_found: No orders found
-    no_payment_methods_found: No payment methods found
     no_payment_found: No payment found
     no_pending_payments: No pending payments
     no_products_found: No products found
-    no_promotions_found: No promotions found
     no_results: No results
     no_rules_added: No rules added
-    no_resource_found: ! 'No %{resource} found'
-    no_shipping_methods_found: No shipping methods found
+    no_resource_found: 'No %{resource} found'
+    no_returns_found: No returns found
     no_shipping_method_selected: No shipping method selected.
-    no_trackers_found: No Trackers Found
-    no_stock_locations_found: No stock locations found
+    no_state_changes: No state changes yet.
     no_tracking_present: No tracking details provided.
     none: None
     none_selected: None Selected
@@ -939,6 +888,7 @@ en:
     order_details: Order Details
     order_email_resent: Order Email Resent
     order_information: Order Information
+    order_line_items: Order Line Items
     order_mailer:
       cancel_email:
         dear_customer: Dear Customer,
@@ -957,10 +907,6 @@ en:
         total: ! 'Order Total:'
     order_not_found: We couldn't find your order. Please try that action again.
     order_number: Order %{number}
-    order_populator:
-      out_of_stock: ! '%{item} is out of stock.'
-      selected_quantity_not_available: ! 'selected of %{item} is not available.'
-      please_enter_reasonable_quantity: Please enter a reasonable quantity.
     order_processed_successfully: Your order has been processed successfully
     order_resumed: Order resumed
     order_state:
@@ -980,6 +926,7 @@ en:
     order_total: Order Total
     order_updated: Order Updated
     orders: Orders
+    other_items_in_other: Other Items in Order
     out_of_stock: Out of Stock
     overview: Overview
     package_from: package from
@@ -993,7 +940,6 @@ en:
     pay: pay
     payment: Payment
     payment_could_not_be_created: Payment could not be created.
-    payment_identifier: Payment Identifier
     payment_information: Payment Information
     payment_method: Payment Method
     payment_methods: Payment Methods
@@ -1021,6 +967,7 @@ en:
     phone: Phone
     place_order: Place Order
     please_define_payment_methods: Please define some payment methods first.
+    please_enter_reasonable_quantity: Please enter a reasonable quantity.
     populate_get_error: Something went wrong. Please try adding the item again.
     powered_by: Powered by
     pre_tax_refund_amount: Pre-Tax Refund Amount
@@ -1029,6 +976,7 @@ en:
     preferred_reimbursement_type: Preferred Reimbursement Type
     presentation: Presentation
     previous: Previous
+    previous_state_missing: "n/a"
     price: Price
     price_range: Price Range
     price_sack: Price Sack
@@ -1040,7 +988,7 @@ en:
     product_properties: Product Properties
     product_rule:
       choose_products: Choose products
-      label: Order must contain %{select} of these products
+      label: Order must contain x amount of these products
       match_all: all
       match_any: at least one
       match_none: none
@@ -1083,6 +1031,9 @@ en:
       one_use_per_user:
         description: Only One Use Per User
         name: One Use Per User
+      option_value:
+        description: Order includes specified product(s) with matching option value(s)
+        name: Option Value(s)
       product:
         description: Order includes specified product(s)
         name: Product(s)
@@ -1108,6 +1059,7 @@ en:
     quantity: Quantity
     quantity_returned: Quantity Returned
     quantity_shipped: Quantity Shipped
+    quick_search: Quick search..
     rate: Rate
     reason: Reason
     receive: receive
@@ -1137,7 +1089,9 @@ en:
     remember_me: Remember me
     remove: Remove
     rename: Rename
+    report: Report
     reports: Reports
+    resellable: Resellable
     resend: Resend
     reset_password: Reset my password
     response_code: Response Code
@@ -1168,6 +1122,7 @@ en:
     return_number: Return Number
     return_quantity: Return Quantity
     returned: Returned
+    returns: Returns
     review: Review
     risk: Risk
     risk_analysis: Risk Analysis
@@ -1177,6 +1132,7 @@ en:
     rma_value: RMA Value
     roles: Roles
     rules: Rules
+    safe: Safe
     sales_total: Sales Total
     sales_total_description: Sales Total For All Orders
     sales_totals: Sales Totals
@@ -1195,12 +1151,13 @@ en:
     select_a_return_authorization_reason: Select a reason for the return authorization
     select_a_stock_location: Select a stock location
     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
     send_mails_as: Send Mails As
     server: Server
     server_error: The server returned an error
     settings: Settings
-    ship: ship
+    ship: Ship
     ship_address: Ship Address
     ship_total: Ship Total
     shipment: Shipment
@@ -1260,8 +1217,41 @@ en:
     state: State
     state_based: State Based
     states: States
+    state_machine_states:
+      accepted: Accepted
+      address: Address
+      authorized: Authorized
+      awaiting: Awaiting
+      awaiting_return: Awaiting return
+      backordered: Back ordered
+      cart: Cart
+      canceled: Canceled
+      checkout: Checkout
+      confirm: Confirm
+      complete: Complete
+      completed: Completed
+      closed: Closed
+      delivery: Delivery
+      errored: Errored
+      failed: Failed
+      given_to_customer: Given to customer
+      invalid: Invalid
+      manual_intervention_required: Manual intervention required
+      open: Open
+      order: Order
+      on_hand: On hand
+      payment: Payment
+      pending: Pending
+      processing: Processing
+      ready: Ready
+      reimbursed: Reimbursed
+      resumed: Resumed
+      returned: Returned
+      shipped: Shipped
+      void: Void
     states_required: States Required
     status: Status
+    stock: Stock
     stock_location: Stock Location
     stock_location_info: Stock location info
     stock_locations: Stock Locations
@@ -1285,6 +1275,7 @@ en:
     successfully_removed: ! '%{resource} has been successfully removed!'
     successfully_signed_up_for_analytics: Successfully signed up for Spree Analytics
     successfully_updated: ! '%{resource} has been successfully updated!'
+    summary: Summary
     tax: Tax
     tax_included: "Tax (incl.)"
     tax_categories: Tax Categories
@@ -1297,7 +1288,7 @@ en:
     taxon_placeholder: Add a Taxon
     taxon_rule:
       choose_taxons: Choose taxons
-      label: Order must contain %{select} of these taxons
+      label: Order must contain x amount of these taxons
       match_all: all
       match_any: at least one
     taxonomies: Taxonomies

data/config/routes.rb

@@ -1 +1 @@
-Spree::Core::Engine.draw_routes
+Spree::Core::Engine.draw_routes