spree_core 4.0.9 → 4.1.0.rc1

data/config/locales/en.yml

@@ -16,6 +16,7 @@ en:
         address1: Address
         address2: Address (contd.)
         city: City
+        company: Company
         country: Country
         firstname: First Name
         lastname: Last Name
@@ -55,7 +56,7 @@ en:
         completed_at: Completed At
         coupon_code: Coupon Code
         created_at: Order Date
-        email: Customer E-Mail
+        email: Email
         ip_address: IP Address
         item_total: Item Total
         number: Number
@@ -97,6 +98,7 @@ en:
         on_hand: On Hand
         shipping_category: Shipping Category
         tax_category: Tax Category
+        less_than: Less than
       spree/promotion:
         advertise: Advertise
         code: Code
@@ -142,7 +144,7 @@ en:
         name: Site Name
         mail_from_address: Mail From Address
       spree/store_credit:
-        amount_used: "Amount used"
+        amount_used: Amount used
       spree/store_credit_category:
         name: Name
       spree/tax_category:
@@ -381,6 +383,9 @@ en:
           attributes:
             attachment:
               not_allowed_content_type: has not allowed content type
+  address_book:
+    save: Save
+    successfully_created: New address has been successfully created
   devise:
     confirmations:
       confirmed: Your account was successfully confirmed. You are now signed in.
@@ -434,6 +439,13 @@ en:
       format:
         precision: 1
 
+  pagination:
+    first: "«"
+    last: "»"
+    previous: "‹"
+    next: "›"
+    truncate: "…"
+
   spree:
     abbreviation: Abbreviation
     accept: Accept
@@ -458,9 +470,11 @@ en:
     activate: Activate
     active: Active
     add: Add
+    add_new_credit_card: Add a new card
     add_action_of_type: Add action of type
     add_country: Add Country
     add_coupon_code: Add Coupon Code
+    add_new_address: Add new address
     add_new_header: Add New Header
     add_new_style: Add New Style
     add_one: Add One
@@ -472,12 +486,18 @@ en:
     add_stock: Add Stock
     add_to_cart: Add To Cart
     add_variant: Add Variant
+    add_store: New Store
     add_store_credit: Add Store Credit
+    added_to_cart: Added to bag successfully!
     additional_item: Additional Item
     address: Address
     address1: Address
     address2: Address (contd.)
     addresses: Addresses
+    address_action_popup:
+      delete_button: yes, delete
+      delete_text: Do you really want <br /> to delete this address?
+      delete_title: Are you sure?
     address_book:
       other_address: "Other address"
       add_new_shipping_address: "Add new address"
@@ -526,6 +546,10 @@ en:
           cancel: cancel
           resume: resume
           resend: Resend
+      orders:
+        cart: Cart
+      return_authorization:
+        product: Product
       user:
         account: Account
         addresses: Addresses
@@ -548,6 +572,8 @@ en:
     all_adjustments_opened: All adjustments successfully opened!
     all_departments: All departments
     all_items_have_been_returned: All items have been returned
+    all_rights_reserved: All rights reserved
+    already_have_account: Already have an account?
     alt_text: Alternative Text
     alternative_phone: Alternative Phone
     amount: Amount
@@ -562,6 +588,7 @@ en:
     authorization_failure: Authorization Failure
     authorized: Authorized
     auto_capture: Auto Capture
+    availability: availability
     available_on: Available On
     available: Available
     average_order_value: Average Order Value
@@ -605,14 +632,33 @@ en:
     card_type: Brand
     card_type_is: Card type is
     cart: Cart
+    cart_page:
+      add_promo_code: ADD PROMO CODE
+      checkout: checkout
+      empty_info: 'Your cart is empty.<br />There are no items in your cart.'
+      header: Your shopping bag
+      product: product
+      quantity: quantity
+      title: Shopping Cart
     cart_subtotal:
       one: 'Subtotal (1 item)'
       other: 'Subtotal (%{count} items)'
     categories: Categories
     category: Category
+    category_nav_bar:
+      get_up_to_30_percent_off: GET UP TO 30% OFF
+      jackets_and_coats: JACKET & COASTS
+      new_collection: NEW COLLECTION
+      special_offers: SPECIAL OFFERS
+      summer_2019: SUMMER 2019
     channel: Channel
     charged: Charged
     checkout: Checkout
+    checkout_page:
+      back_to_cart: back to the cart
+      delivery_method: delivery method
+      header: Checkout
+      product: Product
     choose_a_customer: Choose a customer
     choose_a_taxon_to_sort_products_for: "Choose a taxon to sort products for"
     choose_currency: Choose Currency
@@ -634,7 +680,9 @@ en:
     confirm: Confirm
     confirm_delete: Confirm Deletion
     confirm_password: Password Confirmation
+    contact_us: Contact us
     continue: Continue
+    continue_as_guest: Continue as a guest
     continue_shopping: Continue shopping
     cost_currency: Cost Currency
     cost_price: Cost Price
@@ -662,6 +710,7 @@ en:
     coupon_code_max_usage: Coupon code usage limit exceeded
     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_removed: The coupon code was successfully removed from your order.
     coupon_code_unknown_error: This coupon code could not be applied to the cart at this time.
     create: Create
     create_a_new_account: Create a new account
@@ -686,6 +735,7 @@ en:
     customer_returns: Customer Returns
     customer_search: Customer Search
     cut: Cut
+    cvv: CVV
     cvv_response: CVV Response
     date: Date
     date_completed: Date Completed
@@ -705,6 +755,7 @@ en:
     delete_from_taxon: Delete From Taxon
     discontinued_variants_present: Some line items in this order have products that are no longer available.
     delivery: Delivery
+    delivery_information: Delivery Information
     depth: Depth
     details: Details
     description: Description
@@ -716,10 +767,11 @@ en:
     dismiss_banner: No. Thanks! I'm not interested, do not display this message again
     display: Display
     doesnt_track_inventory: It doesn't track inventory
+    dont_have_account: Don't have an account yet?
     edit: Edit
     editing_resource: 'Editing %{resource}'
     editing_rma_reason: Editing RMA Reason
-    editing_user: Editing User
+    editing_user: Edit Your account
     eligibility_errors:
       messages:
         has_excluded_product: Your cart contains a product that prevents this coupon code from being applied.
@@ -775,6 +827,7 @@ en:
     expedited_exchanges_warning: "Any specified exchanges will ship to the customer immediately upon saving. The customer will be charged the full amount of the item if they do not return the original item within %{days_window} days."
     excl: excl.
     expiration: Expiration
+    expiration_date: Expiration Date
     extension: Extension
     extensions_directory: Extensions Directory
     existing_shipments: Existing shipments
@@ -792,7 +845,8 @@ en:
     flat_percent: Flat Percent
     flat_rate_per_order: Flat Rate
     flexible_rate: Flexible Rate
-    forgot_password: Forgot Password?
+    follow_us: Follow us
+    forgot_password: Forgot password?
     free_shipping: Free Shipping
     free_shipping_amount: "-"
     front_end: Front End
@@ -801,11 +855,34 @@ en:
     general: General
     general_settings: General Settings
     generate_code: Generate coupon code
+    go_to_category: Go to category
+    go_to_facebook: Go to facebook
+    go_to_homepage: Go to Home Page
+    go_to_instagram: Go to instagram
+    go_to_twitter: Go to twitter
     guest_checkout: Guest Checkout
     guest_user_account: Checkout as a Guest
     has_no_shipped_units: has no shipped units
     height: Height
     home: Home
+    homepage:
+      bestsellers: BESTSELLERS
+      fashion_trends: FASHION TRENDS
+      fashion_trends_note: Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam.
+      men: MEN
+      new: NEW
+      new_collection: NEW COLLECTION
+      read_more: READ MORE
+      shoes: SHOES
+      shop_now: SHOP NOW
+      sportswear: SPORTSWEAR
+      streetstyle: STREETSTYLE
+      summer_2019: Summer 2019
+      summer_collection:  Summer Collection
+      summer_sale: SUMMER SALE
+      trending: TRENDING
+      up_to_60: UP TO 60%
+      women: WOMEN
     help_center: Help Center
     i18n:
       available_locales: Available Locales
@@ -824,6 +901,7 @@ en:
     images: Images
     implement_eligible_for_return: "Must implement #eligible_for_return? for your EligibilityValidator."
     implement_requires_manual_intervention: "Must implement #requires_manual_intervention? for your EligibilityValidator."
+    in_stock: In Stock
     inactive: Inactive
     incl: incl.
     included_in_price: Included in Price
@@ -878,6 +956,8 @@ en:
     location: Location
     lock: Lock
     log_entries: "Log Entries"
+    log_in: Log in
+    log_in_to_continue: Log in to continue
     logs: "Logs"
     logged_in_as: Logged in as
     logged_in_succesfully: Logged in successfully
@@ -886,10 +966,12 @@ en:
     login_as_existing: Login as Existing Customer
     login_failed: Login authentication failed.
     login_name: Login
+    logo_alt: Brand logo
     logout: Logout
     look_for_similar_items: Look for similar items
     make_refund: Make refund
     make_sure_the_above_reimbursement_amount_is_correct: Make sure the above reimbursement amount is correct
+    mail_from_address: Mail from address
     manage_promotion_categories: Manage Promotion Categories
     manual_intervention_required: Manual intervention required
     manage_variants: Manage Variants
@@ -916,9 +998,20 @@ en:
     name: Name
     name_on_card: Name on card
     name_or_sku: Name or SKU (enter at least first 3 characters of product name)
+    nav_bar:
+      close_menu: Close menu
+      go_to_previous_menu: Go to previous menu
+      log_in: LOG IN
+      log_out: LOG OUT
+      my_account: MY ACCOUNT
+      my_orders: MY ORDERS
+      show_menu: Show menu
+      show_search: Show search
+      show_user_menu: Show user menu
+      sign_up: SIGN UP
     new: New
     new_adjustment: New Adjustment
-    new_customer: New Customer
+    new_customer: Create new account
     new_customer_return: New Customer Return
     new_country: New Country
     new_image: New Image
@@ -957,9 +1050,13 @@ en:
     new_zone: New Zone
     next: Next
     no_actions_added: No actions added
+    no_address_given: No address given
     no_available_date_set: No available date set
     no_payment_found: No payment found
     no_pending_payments: No pending payments
+    no_product_available:
+      for_this_quantity: Sorry, it looks like some products are not available in selected quantity.
+      opps: Oops!
     no_products_found: No products found
     no_results: No results
     no_rules_added: No rules added
@@ -986,6 +1083,7 @@ en:
       variant_not_deleted: "Variant could not be deleted. Reason: %{error}"
     num_orders: "# Orders"
     number: Number
+    ok: OK
     on_hand: On Hand
     open: Open
     open_all_adjustments: Open All Adjustments
@@ -1037,13 +1135,15 @@ en:
       payment: payment
       resumed: resumed
       returned: returned
+    order_success: Order placed successfully
+    order_success_explain: Your order information will be sent to your email
     order_summary: Order Summary
     order_sure_want_to: Are you sure you want to %{event} this order?
     order_total: Order Total
     order_updated: Order Updated
     orders: Orders
     out_of_stock: Out of Stock
-    backordered_info: Selected item is backordered so expect delays
+    backordered_info: Backordered
     backordered_confirm_info: Selected item is backordered so expect delays. Are you sure you want to order it?
     overview: Overview
     package_from: package from
@@ -1057,6 +1157,7 @@ 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
@@ -1065,7 +1166,6 @@ en:
     payment_processor_choose_banner_text: If you need help choosing a payment processor, please visit
     payment_processor_choose_link: our payments page
     payment_state: Payment State
-    payment_identifier: Payment Identifier
     payment_states:
       balance_due: balance due
       checkout: checkout
@@ -1076,8 +1176,17 @@ en:
       pending: pending
       processing: processing
       void: void
+    payment_type: Payment type
     payment_updated: Payment Updated
     payments: Payments
+    pdp:
+      checkout: Checkout
+      description: Description
+      details: Details
+      products_included_in_promotion: Products included in the promotion
+      quantity: Quantity
+      view_cart: View cart
+      you_may_also_like: You may also like
     percent: Percent
     percent_per_item: Percent Per Item
     permalink: Permalink
@@ -1087,6 +1196,31 @@ en:
     place_order: Place Order
     please_define_payment_methods: Please define some payment methods first.
     please_enter_reasonable_quantity: Please enter a reasonable quantity.
+    plp:
+      best_selling: BEST SELLING
+      clear_all: CLEAR ALL
+      collection: COLLECTION
+      color: COLOR
+      done: DONE
+      default: DEFAULT
+      filter_by: FILTER BY
+      home: Home
+      newest_first: NEWEST FIRST
+      no_results: No results
+      no_results_found: No results found
+      not_found_filters1: We couldn’t find a match for these filters.
+      not_found_filters2: Please try another choose.
+      not_found_text1: We couldn’t find products for '%{keywords}'.
+      not_found_text2: Please try another search.
+      price: PRICE
+      price_high_to_low: PRICE (HIGH - LOW)
+      price_low_to_high: PRICE (LOW - HIGH)
+      result: RESULT
+      results_for: RESULTS FOR
+      size: SIZE
+      sort_by: SORT BY
+      top_sellers: TOP SELLERS
+      type: TYPE
     populate_get_error: Something went wrong. Please try adding the item again.
     powered_by: Powered by
     pre_tax_refund_amount: Pre-Tax Refund Amount
@@ -1216,6 +1350,7 @@ en:
     rename: Rename
     report: Report
     reports: Reports
+    required_fields: required fields
     resellable: Resellable
     resend: Resend
     reset_password: Reset my password
@@ -1286,6 +1421,7 @@ en:
     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
+    seo_title: SEO title
     server: Server
     server_error: The server returned an error
     settings: Settings
@@ -1342,6 +1478,7 @@ en:
     show_only_complete_orders: Only show complete orders
     show_only_considered_risky: Only show risky orders
     show_rate_in_label: Show rate in label
+    sign_up: Sign Up
     sku: SKU
     skus: SKUs
     slug: Slug
@@ -1406,20 +1543,24 @@ en:
     stock_transfers: Stock Transfers
     stop: Stop
     store: Store
+    store_errors:
+      unable_to_create: Unable to create store.
+      unable_to_update: Unable to update store.
+      unable_to_delete: Unable to delete store.
+    store_set_default_button: Set as default
     stores: Stores
-    add_store: New Store
     store_credit_name: Store Credit
     store_credit:
       credit: "Credit"
       authorized: "Authorized"
       captured: "Used"
       allocated: "Added"
-      apply: Apply Store Credit
-      remove: Remove 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}.
+      apply: Apply
+      remove: Remove
+      applicable_amount: "<strong>%{amount}</strong> in store credit will be applied to this order."
+      available_amount: "You have <strong>%{amount}</strong> in Store Credit available!"
+      remaining_amount: "You have <strong>%{amount}</strong> remaining in your account's Store Credit."
+      additional_payment_needed: Select another payment method for the remaining <strong>%{amount}</strong>.
       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
@@ -1465,6 +1606,7 @@ en:
     taxon_placeholder: Add a Taxon
     tags: Tags
     tags_placeholder: Add Tags
+    taxon_missing_alt: Category banner description
     taxon_rule:
       choose_taxons: Choose taxons
       label: Order must contain x amount of these taxons

data/db/default/spree/stores.rb

@@ -1,10 +1,15 @@
 # Possibly already created by a migration.
-unless Spree::Store.where(code: 'spree').exists?
+unless Spree::Store.default.persisted?
   Spree::Store.new do |s|
-    s.code              = 'spree'
     s.name              = 'Spree Demo Site'
-    s.url               = 'example.com'
+    s.code              = 'spree'
+    s.url               = Rails.application.routes.default_url_options[:host] || 'demo.spreecommerce.org'
     s.mail_from_address = 'spree@example.com'
     s.default_currency  = 'USD'
+    s.seo_title         = 'Spree Commerce Demo Shop'
+    s.meta_description  = 'Spree Commerce is an open source Ecommerce framework decision makers want, developers enjoy.'
+    s.facebook          = 'spreecommerce'
+    s.twitter           = 'spreecommerce'
+    s.instagram         = 'spreecommerce'
   end.save!
 end

data/db/migrate/20140309033438_create_store_from_preferences.rb

@@ -6,7 +6,7 @@ class CreateStoreFromPreferences < ActiveRecord::Migration[4.2]
         false
       end
     end
-    
+
     preference_store = Spree::Preferences::Store.instance
     if store = Spree::Store.where(default: true).first
       store.meta_description = preference_store.get('spree/app_configuration/default_meta_description') {}
@@ -26,10 +26,14 @@ class CreateStoreFromPreferences < ActiveRecord::Migration[4.2]
           'spree@example.com'
         end
 
-        s.meta_description = preference_store.get('spree/app_configuration/default_meta_description') {}
+        s.meta_description = preference_store.get('spree/app_configuration/default_meta_description') do
+          'Spree Commerce is an open source Ecommerce framework decision makers want, developers enjoy.'
+        end
         s.meta_keywords    = preference_store.get('spree/app_configuration/default_meta_keywords') {}
-        s.seo_title        = preference_store.get('spree/app_configuration/default_seo_title') {}
-        s.default_currency = preference_store.get('spree/app_configuration/currency') {}
+        s.seo_title        = preference_store.get('spree/app_configuration/default_seo_title') do
+          'Spree Commerce Demo Shop'
+        end
+        s.default_currency = preference_store.get('spree/app_configuration/currency') { 'USD' }
         s.code             = 'spree'
       end.save!
     end

data/db/migrate/20191005121504_add_store_id_to_payment_methods.rb

@@ -0,0 +1,7 @@
+class AddStoreIdToPaymentMethods < ActiveRecord::Migration[5.2]
+  def change
+    unless column_exists?(:spree_payment_methods, :store_id)
+      add_reference :spree_payment_methods, :store, references: :spree_stores, index: true
+    end
+  end
+end

data/db/migrate/20191016134113_add_deafult_value_for_store_default_currency.rb

@@ -0,0 +1,5 @@
+class AddDeafultValueForStoreDefaultCurrency < ActiveRecord::Migration[6.0]
+  def change
+    Spree::Store.where(default_currency: nil).update_all(default_currency: Spree::Config[:currency])
+  end
+end

data/db/migrate/20200102141311_add_social_to_spree_stores.rb

@@ -0,0 +1,7 @@
+class AddSocialToSpreeStores < ActiveRecord::Migration[6.0]
+  def change
+    add_column :spree_stores, :facebook, :string
+    add_column :spree_stores, :twitter, :string
+    add_column :spree_stores, :instagram, :string
+  end
+end

data/lib/generators/spree/dummy/dummy_generator.rb

@@ -32,6 +32,7 @@ module Spree
       opts[:skip_bundle] = true
       opts[:skip_gemfile] = true
       opts[:skip_git] = true
+      opts[:skip_keeps] = true
       opts[:skip_listen] = true
       opts[:skip_rc] = true
       opts[:skip_spring] = true
@@ -56,6 +57,7 @@ module Spree
       template 'rails/test.rb', "#{dummy_path}/config/environments/test.rb", force: true
       template 'rails/script/rails', "#{dummy_path}/spec/dummy/script/rails", force: true
       template 'initializers/devise.rb', "#{dummy_path}/config/initializers/devise.rb", force: true
+      template 'initializers/bullet.rb', "#{dummy_path}/config/initializers/bullet.rb", force: true
     end
 
     def test_dummy_inject_extension_requirements
@@ -136,7 +138,7 @@ end
     end
 
     def gemfile_path
-      core_gems = ['spree/core', 'spree/api', 'spree/backend', 'spree/frontend', 'spree/sample']
+      core_gems = ['spree/core', 'spree/api', 'spree/backend', 'spree/frontend']
 
       if core_gems.include?(lib_name)
         '../../../../../Gemfile'

data/lib/generators/spree/dummy/templates/initializers/bullet.rb

@@ -0,0 +1,5 @@
+if Rails.env.development? && defined?(Bullet)
+  Bullet.enable = true
+  Bullet.rails_logger = true
+  Bullet.stacktrace_includes = [ 'spree_core', 'spree_frontend', 'spree_api', 'spree_backend' ]
+end

data/lib/generators/spree/install/install_generator.rb

@@ -10,7 +10,7 @@ module Spree
     class_option :migrate, type: :boolean, default: true, banner: 'Run Spree migrations'
     class_option :seed, type: :boolean, default: true, banner: 'load seed data (migrations must be run)'
     class_option :sample, type: :boolean, default: true, banner: 'load sample data (migrations must be run)'
-    class_option :copy_views, type: :boolean, default: true, banner: 'copy frontend views from spree to your application for easy customization'
+    class_option :copy_storefront, type: :boolean, default: true, banner: 'copy storefront from spree frontend to your application for easy customization'
     class_option :auto_accept, type: :boolean
     class_option :user_class, type: :string
     class_option :admin_email, type: :string
@@ -30,7 +30,7 @@ module Spree
       @run_migrations = options[:migrate]
       @load_seed_data = options[:seed]
       @load_sample_data = options[:sample]
-      @copy_views = options[:copy_views]
+      @copy_storefront = options[:copy_storefront]
 
       unless @run_migrations
         @load_seed_data = false
@@ -40,6 +40,11 @@ module Spree
 
     def add_files
       template 'config/initializers/spree.rb', 'config/initializers/spree.rb'
+
+      if Spree::Core::Engine.frontend_available? || Rails.env.test?
+        template 'config/initializers/spree_storefront.rb', 'config/initializers/spree_storefront.rb'
+        template 'config/spree_storefront.yml', 'config/spree_storefront.yml'
+      end
     end
 
     def additional_tweaks
@@ -54,6 +59,9 @@ module Spree
         Disallow: /account
         Disallow: /api
         Disallow: /password
+        Disallow: /api_tokens
+        Disallow: /cart_link
+        Disallow: /account_link
       ROBOTS
     end
 
@@ -83,9 +91,9 @@ module Spree
       empty_directory 'app/overrides'
     end
 
-    def copy_views
-      if @copy_views && Spree::Core::Engine.frontend_available?
-        generate 'spree:frontend:copy_views'
+    def copy_storefront
+      if @copy_storefront && Spree::Core::Engine.frontend_available?
+        generate 'spree:frontend:copy_storefront'
       end
     end
 

data/lib/generators/spree/install/templates/config/initializers/spree.rb

@@ -26,6 +26,5 @@ Spree.dependencies do |dependencies|
   # dependencies.cart_add_item_service = 'MyNewAwesomeService'
 end
 
-# Spree::Api::Dependencies.storefront_cart_serializer = 'MyRailsApp::CartSerializer'
 
 Spree.user_class = <%= (options[:user_class].blank? ? 'Spree::LegacyUser' : options[:user_class]).inspect %>

data/lib/generators/spree/install/templates/config/initializers/spree_storefront.rb

@@ -0,0 +1 @@
+SpreeStorefrontConfig = YAML.load_file(Rails.root.join('config', 'spree_storefront.yml')).with_indifferent_access