Merge pull request #5663 from luisramos0/constraints

Make db timestamps nullable

config/locales/ar.yml

@@ -1134,13 +1134,13 @@ ar:
     menu:
       cart:
         cart: "سلة"
+      cart_sidebar:
+        checkout: "تابع للخروج"
+        close: "إغلاق"
       signed_in:
         profile: "الملف الشخصي"
       mobile_menu:
         cart: "سلة"
-      joyride:
-        checkout: "الخروج الآن"
-        already_ordered_products: "تم الطلب بالفعل في دورة الطلب هذه"
     register_call:
       selling_on_ofn: "هل أنت مهتم بالحصول على شبكة الغذاء المفتوح؟"
       register: "سجل هنا"

config/locales/ca.yml

@@ -898,7 +898,7 @@ ca:
         incoming: "2. Productes entrants"
         outgoing: "3. Productes sortints"
       exchange_form:
-        pickup_time_tip: Quan les comandes d'aquest cicle de comandes estiguin preparades per a les consumidores
+        pickup_time_tip: Quan les comandes d'aquest cicle de comandes estiguin llestes per a les consumidores
         pickup_instructions_placeholder: "Instruccions de recollida"
         pickup_instructions_tip: Aquestes instruccions es mostraran a les consumidores després d'haver completat una comanda
         pickup_time_placeholder: "Preparat per (és a dir, data / hora)"
@@ -948,7 +948,7 @@ ca:
         distributors: distribuïdores
         variants: variants
       simple_form:
-        ready_for: Preparat per
+        ready_for: Llest per
         ready_for_placeholder: Data / hora
         customer_instructions: Instruccions de la consumidora
         customer_instructions_placeholder: Notes de recollida o de lliurament
@@ -1109,7 +1109,7 @@ ca:
       pause_failure_msg: "Ho sentim, la pausa ha fallat!"
       confirm_unpause_msg: "Si teniu un cicle de comanda obert a la programació d'aquesta subscripció, es crearà una comanda per a aquesta consumidora. Esteu segur que voleu anul·lar aquesta subscripció?"
       unpause_failure_msg: "Ho sentim, la represa ha fallat!"
-      confirm_cancel_open_orders_msg: "Actualment hi ha algunes comandes obertes per a aquesta subscripció. Ja s'ha notificat a les consumidores que les comandes serà atesa. Voleu cancel·lar aquestes comandes o conservar-les?"
+      confirm_cancel_open_orders_msg: "Actualment hi ha algunes comandes obertes per a aquesta subscripció. Ja s'ha notificat a les consumidores que la comanda seran ateses. Voleu cancel·lar aquestes comandes o conservar-les?"
       resume_canceled_orders_msg: "Algunes comandes d'aquesta subscripció es poden reprendre ara mateix. Podeu reprendre-les des del menú desplegable de comandes."
       yes_cancel_them: Cancel·lar-les
       no_keep_them: Conservar-les
@@ -1150,13 +1150,18 @@ ca:
     menu:
       cart:
         cart: "Cistella"
+      cart_sidebar:
+        checkout: "Realitza la comanda"
+        edit_cart: "Edita la cistella"
+        items_in_cart_singular: "%{num} item a la teva cistella"
+        items_in_cart_plural: "%{num} item a la teva cistella"
+        close: "Tanca"
+        cart_empty: "La teva cistella és buida"
+        take_me_shopping: "Porta’m de compres!"
       signed_in:
         profile: "Perfil"
       mobile_menu:
         cart: "Cistella"
-      joyride:
-        checkout: "Validar ara"
-        already_ordered_products: "Ja està demanat en aquest cicle de comanda"
     register_call:
       selling_on_ofn: "Estàs interessat en formar part d'Open Food Network?"
       register: "Registra't aquí"
@@ -1387,7 +1392,7 @@ ca:
   stats_orders: "comandes de menjar"
   checkout_title: Realitza la comanda
   checkout_now: Validar ara
-  checkout_order_ready: Comanda preparada per
+  checkout_order_ready: Comanda llesta per
   checkout_hide: Amaga
   checkout_expand: Expandeix
   checkout_headline: "Estàs preparada per validar la compra?"
@@ -1399,7 +1404,7 @@ ca:
   checkout_default_ship_address: "Desa per defecte com a adreça d'enviament "
   checkout_method_free: Gratuït
   checkout_address_same: L'adreça d'enviament és igual que l'adreça de facturació?
-  checkout_ready_for: "Preparat per:"
+  checkout_ready_for: "Llest per:"
   checkout_instructions: "Alguns comentaris o instruccions especials?"
   checkout_payment: Pagament
   checkout_send: Realitza una comanda ara
@@ -1522,7 +1527,7 @@ ca:
   shopping_groups_part_of: "forma part de:"
   shopping_producers_of_hub: "Productores de%{hub}:"
   enterprises_next_closing: "Tancament de la comanda següent"
-  enterprises_ready_for: "Preparat per"
+  enterprises_ready_for: "Llest per"
   enterprises_choose: "Escull quan vols la teva comanda:"
   maps_open: "Obert"
   maps_closed: "Tancat"
@@ -1667,7 +1672,7 @@ ca:
   orders_fees: Comissions...
   orders_edit_title: Cistella de la compra
   orders_edit_headline: El teu cistell de la compra
-  orders_edit_time: Comanda preparada per
+  orders_edit_time: Comanda llesta per
   orders_edit_continue: Continuar comprant
   orders_edit_checkout: Realitza la compra
   orders_form_empty_cart: "Cistella buida"

config/locales/de_DE.yml

@@ -1142,13 +1142,13 @@ de_DE:
     menu:
       cart:
         cart: "Wagen"
+      cart_sidebar:
+        checkout: "Kasse"
+        close: "Abschließen"
       signed_in:
         profile: "Profil"
       mobile_menu:
         cart: "Wagen"
-      joyride:
-        checkout: "Zur Kasse"
-        already_ordered_products: "Bereits in diesem Bestellzyklus bestellt"
     register_call:
       selling_on_ofn: "Sie möchten selbst im Open Food Network verkaufen?"
       register: "Hier anmelden"

config/locales/en_AU.yml

@@ -704,14 +704,11 @@ en_AU:
           shopfront_message: "\"Home\" message"
           shopfront_message_placeholder: >
               Create your home page content to welcome customers and explain how people
-              can shop with you.
-
-              Include details about your delivery and pick up options, how often you
-              open the shop for orders, and all the details your customers will need
-              to understand the process of buying from you.
-
-              You can also include links to your newsletter sign up, so that people
-              can connect with you to hear when your next order cycle opens.
+              can shop with you. Include details about your delivery and pick up options,
+              how often you open the shop for orders, and all the details your customers
+              will need to understand the process of buying from you. You can also
+              include links to your newsletter sign up, so that people can connect
+              with you to hear when your next order cycle opens.
           shopfront_message_link_tooltip: "Insert / edit link"
           shopfront_message_link_prompt: "Please enter a URL to insert"
           shopfront_closed_message: "Shopfront Closed Message"
@@ -1141,13 +1138,13 @@ en_AU:
     menu:
       cart:
         cart: "Cart"
+      cart_sidebar:
+        checkout: "Checkout"
+        close: "Close"
       signed_in:
         profile: "Profile"
       mobile_menu:
         cart: "Cart"
-      joyride:
-        checkout: "Checkout now"
-        already_ordered_products: "Already ordered in this order cycle"
     register_call:
       selling_on_ofn: "Interested in getting on the Open Food Network?"
       register: "Register here"

config/locales/en_BE.yml

@@ -1099,13 +1099,13 @@ en_BE:
     menu:
       cart:
         cart: "Cart"
+      cart_sidebar:
+        checkout: "Checkout"
+        close: "Close"
       signed_in:
         profile: "Profile"
       mobile_menu:
         cart: "Cart"
-      joyride:
-        checkout: "Checkout now"
-        already_ordered_products: "Already ordered in this order cycle"
     register_call:
       selling_on_ofn: "Interested in getting on the Open Food Network?"
       register: "Register here"

config/locales/en_CA.yml

@@ -1146,13 +1146,13 @@ en_CA:
     menu:
       cart:
         cart: "Cart"
+      cart_sidebar:
+        checkout: "Checkout"
+        close: "Close"
       signed_in:
         profile: "Profile"
       mobile_menu:
         cart: "Cart"
-      joyride:
-        checkout: "Checkout now"
-        already_ordered_products: "Already ordered in this order cycle"
     register_call:
       selling_on_ofn: "Interested in getting on the Open Food Network?"
       register: "Register here"

config/locales/en_DE.yml

@@ -1109,13 +1109,13 @@ en_DE:
     menu:
       cart:
         cart: "Cart"
+      cart_sidebar:
+        checkout: "Checkout"
+        close: "Close"
       signed_in:
         profile: "Profile"
       mobile_menu:
         cart: "Cart"
-      joyride:
-        checkout: "Checkout now"
-        already_ordered_products: "Already ordered in this order cycle"
     register_call:
       selling_on_ofn: "Interested in getting on the Open Food Network?"
       register: "Register here"

config/locales/en_FR.yml

@@ -1147,13 +1147,18 @@ en_FR:
     menu:
       cart:
         cart: "Cart"
+      cart_sidebar:
+        checkout: "Checkout"
+        edit_cart: "Edit cart"
+        items_in_cart_singular: "%{num} item in your cart"
+        items_in_cart_plural: "%{num} item in your cart"
+        close: "Close"
+        cart_empty: "Your cart is empty"
+        take_me_shopping: "Take me shopping!"
       signed_in:
         profile: "Profile"
       mobile_menu:
         cart: "Cart"
-      joyride:
-        checkout: "Checkout now"
-        already_ordered_products: "Already ordered in this order cycle"
     register_call:
       selling_on_ofn: "Interested in getting on the Open Food Network?"
       register: "Register here"

config/locales/en_GB.yml

@@ -370,7 +370,10 @@ en_GB:
         title: "Matomo Settings"
         matomo_url: "Matomo URL"
         matomo_site_id: "Matomo Site ID"
+        matomo_tag_manager_url: "Matomo Tag Manager URL"
+        info_html: "Matomo is a Web and Mobile Analytics application. You can either host Matomo on-premises or use a cloud-hosted service. See <a href='http://matomo.org' target='_blank'>matomo.org</a> for more information."
         config_instructions_html: "Here you can configure the OFN Matomo integration. The Matomo URL below should point to the Matomo instance where the user tracking information will be sent to; if it is left empty, Matomo user tracking will be disabled. The Site ID field is not mandatory but useful if you are tracking more than one website on a single Matomo instance; it can be found on the Matomo instance console."
+        config_instructions_tag_manager_html: "Setting the Matomo Tag Manager URL enables Matomo Tag Manager. This tool allows you to set up analytics events. The Matomo Tag Manager URL is copied from the Install Code section of Matomo Tag Manager. Ensure you select the right container and environment as these options change the URL."
     customers:
       index:
         new_customer: "New Customer"
@@ -476,6 +479,7 @@ en_GB:
         line_number: "Line %{number}:"
         encoding_error: "Please check the language setting of your source file and ensure it is saved with UTF-8 encoding"
         unexpected_error: "Product Import encountered an unexpected error whilst opening the file: %{error_message}"
+        malformed_csv: "Product Import found CSV was incorrectly formatted: %{error_message}"
       index:
         notice: "Notice"
         beta_notice: "This feature is still in beta: you may experience some errors while using it. Please don't hesitate to contact support."
@@ -1143,13 +1147,18 @@ en_GB:
     menu:
       cart:
         cart: "Basket"
+      cart_sidebar:
+        checkout: "Checkout"
+        edit_cart: "Edit basket"
+        items_in_cart_singular: "%{num} item in your basket"
+        items_in_cart_plural: "%{num} items in your basket"
+        close: "Close"
+        cart_empty: "Your basket is empty"
+        take_me_shopping: "Take me shopping!"
       signed_in:
         profile: "Profile"
       mobile_menu:
         cart: "Basket"
-      joyride:
-        checkout: "Checkout now"
-        already_ordered_products: "Already ordered in this order cycle"
     register_call:
       selling_on_ofn: "Interested in selling through the Open Food Network?"
       register: "Register here"
@@ -2817,6 +2826,12 @@ en_GB:
     void: "Void"
     login: "Login"
     password: "Password"
+    signature: "Signature"
+    solution: "Solution"
+    landing_page: "Landing Page"
+    server: "Server"
+    test_mode: "Test Mode"
+    logourl: "Logo url"
     configurations: "Configurations"
     general_settings: "General Settings"
     site_name: "Site Name"
@@ -2933,6 +2948,12 @@ en_GB:
     options: "Options"
     actions:
       update: "Update"
+    shared:
+      error_messages:
+        errors_prohibited_this_record_from_being_saved:
+          one: "1 error prohibited this record from being saved:"
+          other: "%{count} errors prohibited this record from being saved:"
+        there_were_problems_with_the_following_fields: "There were problems with the following fields"
     errors:
       messages:
         blank: "can't be blank"
@@ -3102,9 +3123,11 @@ en_GB:
           display: "Display"
           active: "Active"
           both: "Both"
+          front_end: "Checkout only"
           back_end: "Back office only"
           active_yes: "Yes"
           active_no: "No"
+          no_payment_methods_found: "No payment methods found"
         new:
           new_payment_method: "New Payment Method"
           back_to_payment_methods_list: "Back To Payment Methods List"
@@ -3134,8 +3157,10 @@ en_GB:
           active_yes: "Yes"
           active_no: "No"
           both: "Both Checkout and Back office"
+          front_end: "Checkout only"
           back_end: "Back office only"
           tags: "Tags"
+          deactivation_warning: "De-activating a payment method can make the payment method disappear from your list. Alternatively, you can hide a payment method from the checkout page by setting the option 'Display' to 'back office only'."
         providers:
           provider: "Provider"
       payments:
@@ -3306,6 +3331,14 @@ en_GB:
       invalid: invalid
     order_mailer:
       cancel_email:
+        customer_greeting: "Dear %{name},"
+        instructions_html: "Your order with <strong>%{distributor}</strong> has been CANCELED. Please retain this cancellation information for your records."
+        dont_cancel: "If you have changed your mind or don't wish to cancel this order please contact %{email}"
+        order_summary_canceled_html: "<strong>Order Summary #%{number} [CANCELED]</strong>"
+        details: "Here are the details of what you ordered:"
+        unpaid_order: "Your order was unpaid so no refund has been made"
+        paid_order: "Your order was paid so %{distributor} has refunded the full amount"
+        credit_order: "Your order was paid so your account has been credited"
         subject: "Cancellation of Order"
       confirm_email:
         subject: "Order Confirmation"

config/locales/en_IE.yml

@@ -1142,13 +1142,13 @@ en_IE:
     menu:
       cart:
         cart: "Basket"
+      cart_sidebar:
+        checkout: "Checkout"
+        close: "Close"
       signed_in:
         profile: "Profile"
       mobile_menu:
         cart: "Basket"
-      joyride:
-        checkout: "Checkout now"
-        already_ordered_products: "Already ordered in this order cycle"
     register_call:
       selling_on_ofn: "Interested in selling through the Open Food Network?"
       register: "Register here"

config/locales/en_NZ.yml

@@ -1146,13 +1146,13 @@ en_NZ:
     menu:
       cart:
         cart: "Cart"
+      cart_sidebar:
+        checkout: "Checkout"
+        close: "Close"
       signed_in:
         profile: "Profile"
       mobile_menu:
         cart: "Cart"
-      joyride:
-        checkout: "Checkout now"
-        already_ordered_products: "Already ordered in this order cycle"
     register_call:
       selling_on_ofn: "Interested in getting on the Open Food Network?"
       register: "Register here"

config/locales/en_PH.yml

@@ -1140,13 +1140,13 @@ en_PH:
     menu:
       cart:
         cart: "Cart"
+      cart_sidebar:
+        checkout: "Checkout"
+        close: "Close"
       signed_in:
         profile: "Profile"
       mobile_menu:
         cart: "Cart"
-      joyride:
-        checkout: "Checkout now"
-        already_ordered_products: "Already ordered in this order cycle"
     register_call:
       selling_on_ofn: "Interested in getting on the Open Food Network?"
       register: "Register here"

config/locales/en_US.yml

@@ -33,6 +33,10 @@ en_US:
               taken: "There's already an account registered for this email. Please login to reset your password."
         spree/order:
           no_card: There are no authorized credit cards available to charge
+        spree/credit_card:
+          attributes:
+            base:
+              card_expired: "has expired"
         order_cycle:
           attributes:
             orders_close_at:
@@ -321,6 +325,7 @@ en_US:
     show_n_more: Show %{num} more
     choose: "Choose..."
     please_select: Please select...
+    column_save_as_default: Save As Default
     columns: Columns
     actions: Actions
     viewing: "Viewing: %{current_view_name}"
@@ -365,7 +370,10 @@ en_US:
         title: "Matomo Settings"
         matomo_url: "Matomo URL"
         matomo_site_id: "Matomo Site ID"
+        matomo_tag_manager_url: "Matomo Tag Manager URL"
+        info_html: "Matomo is a Web and Mobile Analytics application. You can either host Matomo on-premises or use a cloud-hosted service. See <a href='http://matomo.org' target='_blank'>matomo.org</a> for more information."
         config_instructions_html: "Here you can configure the OFN Matomo integration. The Matomo URL below should point to the Matomo instance where the user tracking information will be sent to; if it is left empty, Matomo user tracking will be disabled. The Site ID field is not mandatory but useful if you are tracking more than one website on a single Matomo instance; it can be found on the Matomo instance console."
+        config_instructions_tag_manager_html: "Setting the Matomo Tag Manager URL enables Matomo Tag Manager. This tool allows you to set up analytics events. The Matomo Tag Manager URL is copied from the Install Code section of Matomo Tag Manager. Ensure you select the right container and environment as these options change the URL."
     customers:
       index:
         new_customer: "New Customer"
@@ -471,6 +479,7 @@ en_US:
         line_number: "Line %{number}:"
         encoding_error: "Please check the language setting of your source file and ensure it is saved with UTF-8 encoding"
         unexpected_error: "Product Import encountered an unexpected error when opening the file: %{error_message}"
+        malformed_csv: "Product Import encountered a malformed CSV: %{error_message}"
       index:
         notice: "Notice"
         beta_notice: "This feature is still in beta: you may experience some errors while using it. Please don't hesitate to contact support."
@@ -683,6 +692,7 @@ en_US:
           ofn_uid_tip: The unique id used to identify the enterprise on Open Food Network.
         shipping_methods:
           name: "Name"
+          applies: "Active?"
           manage: "Manage Shipping Methods"
           create_button: "Create New Shipping Method"
           create_one_button: "Create One Now"
@@ -861,6 +871,7 @@ en_US:
         incoming: "Incoming"
         supplier: "Supplier"
         products: "Products"
+        receival_details: "Receival Details"
         fees: "Fees"
         save: "Save"
         save_and_next: "Save and Next"
@@ -1136,13 +1147,18 @@ en_US:
     menu:
       cart:
         cart: "Cart"
+      cart_sidebar:
+        checkout: "Checkout"
+        edit_cart: "Edit cart"
+        items_in_cart_singular: "%{num} item in your cart"
+        items_in_cart_plural: "%{num} items in your cart"
+        close: "Close"
+        cart_empty: "Your cart is empty"
+        take_me_shopping: "Let's go shopping!"
       signed_in:
         profile: "Profile"
       mobile_menu:
         cart: "Cart"
-      joyride:
-        checkout: "Checkout now"
-        already_ordered_products: "Already ordered in this order cycle"
     register_call:
       selling_on_ofn: "Interested in selling through the Open Food Network?"
       register: "Register here"
@@ -1170,7 +1186,11 @@ en_US:
         signup: "signup"
         contact: "contact"
         require_customer_login: "Only approved customers can access this shop."
+        require_login_html: "If you're already an approved customer, %{login} or %{signup} to proceed."
+        require_login_2_html: "Want to start shopping here? Please %{contact} %{enterprise} and ask about joining."
         require_customer_html: "If you'd like to start shopping here, please %{contact} %{enterprise} to ask about joining."
+      select_oc:
+        select_oc_html: "Please <span class='highlighted'>choose when you want your order</span>, to see what products are available."
   card_could_not_be_updated: Card could not be updated
   card_could_not_be_saved: card could not be saved
   spree_gateway_error_flash_for_checkout: "There was a problem with your payment information: %{error}"
@@ -1530,12 +1550,17 @@ en_US:
   orders_changeable_orders_alert_html: This order has been confirmed, but you can make changes until <strong>%{oc_close}</strong>.
   products_clear: Clear
   products_showing: "Showing:"
+  products_results_for: "Results for"
   products_or: "or"
   products_and: "and"
+  products_filters_in: "in"
   products_with: with
+  products_search: "Search..."
   products_filter_by: "Filter by"
   products_filter_selected: "selected"
+  products_filter_heading: "Filters"
   products_filter_clear: "Clear"
+  products_filter_done: "Done"
   products_loading: "Loading products..."
   products_updating_cart: "Updating cart..."
   products_cart_empty: "Cart empty"
@@ -1546,6 +1571,8 @@ en_US:
   products_update_error_msg: "Saving failed."
   products_update_error_data: "Save failed due to invalid data:"
   products_changes_saved: "Changes saved."
+  products_no_results_html: "Sorry, no results found for %{query}"
+  products_clear_search: "Clear search"
   search_no_results_html: "Sorry, no results found for %{query}. Try another search?"
   components_profiles_popover: "Profiles do not have a shopfront on the Open Food Network, but may have their own physical or online shop elsewhere"
   components_profiles_show: "Show profiles"
@@ -1901,6 +1928,7 @@ en_US:
   admin_enterprise_relationships_permits: "permits"
   admin_enterprise_relationships_seach_placeholder: "Search"
   admin_enterprise_relationships_button_create: "Create"
+  admin_enterprise_relationships_to: "to"
   admin_enterprise_groups: "Enterprise Groups"
   admin_enterprise_groups_name: "Name"
   admin_enterprise_groups_owner: "Owner"
@@ -2306,6 +2334,10 @@ en_US:
     resolve_errors: Please resolve the following errors
     more_items: "+ %{count} More"
     default_card_updated: Default Card Updated
+    cart:
+      add_to_cart_failed: >
+          There was a problem adding this product to the cart. Perhaps it has become
+          unavailable or the shop is closing.
     admin:
       enterprise_limit_reached: "You have reached the standard limit of enterprises per account. Write to %{contact_email} if you need to increase it."
       modals:
@@ -2621,6 +2653,9 @@ en_US:
     tub:
       one: "tub"
       other: "tubs"
+    punnet:
+      one: "baskets"
+      other: "baskets"
     packet:
       one: "packet"
       other: "packets"
@@ -2785,6 +2820,12 @@ en_US:
     void: "Void"
     login: "Login"
     password: "Password"
+    signature: "Signature"
+    solution: "Solution"
+    landing_page: "Landing Page"
+    server: "Server"
+    test_mode: "Test Mode"
+    logourl: "Logourl"
     configurations: "Configurations"
     general_settings: "General Settings"
     site_name: "Site Name"
@@ -2901,6 +2942,12 @@ en_US:
     options: "Options"
     actions:
       update: "Update"
+    shared:
+      error_messages:
+        errors_prohibited_this_record_from_being_saved:
+          one: "1 error prohibited this record from being saved:"
+          other: "%{count} errors prohibited this record from being saved:"
+        there_were_problems_with_the_following_fields: "There were problems with the following fields"
     errors:
       messages:
         blank: "can't be blank"
@@ -3043,6 +3090,8 @@ en_US:
           zone: "Zone"
           calculator: "Calculator"
           display: "Display"
+          both: "Both Checkout and Back office"
+          back_end: "Back office only"
           no_shipping_methods_found: "No shipping methods found"
         new:
           new_shipping_method: "New Shipping Method"
@@ -3054,6 +3103,9 @@ en_US:
         form:
           categories: "Categories"
           zones: "Zones"
+          both: "Both Checkout and Back office"
+          back_end: "Back office only"
+          deactivation_warning: "De-activating a shipping method can make the shipping method disappear from your list. Alternatively, you can hide a shipping method from the checkout page by setting the option 'Display' to 'back office only'."
       payment_methods:
         index:
           payment_methods: "Payment Methods"
@@ -3065,8 +3117,11 @@ en_US:
           display: "Display"
           active: "Active"
           both: "Both"
+          front_end: "Checkout only"
+          back_end: "Back office only"
           active_yes: "Yes"
           active_no: "No"
+          no_payment_methods_found: "No payment methods found"
         new:
           new_payment_method: "New Payment Method"
           back_to_payment_methods_list: "Back To Payment Methods List"
@@ -3095,7 +3150,11 @@ en_US:
           active: "Active"
           active_yes: "Yes"
           active_no: "No"
+          both: "Both Checkout and Back office"
+          front_end: "Checkout only"
+          back_end: "Back office only"
           tags: "Tags"
+          deactivation_warning: "De-activating a payment method can make the payment method disappear from your list. Alternatively, you can hide a payment method from the checkout page by setting the option 'Display' to 'back office only'."
         providers:
           provider: "Provider"
       payments:
@@ -3192,10 +3251,13 @@ en_US:
         new:
           new_variant: "New Variant"
         form:
+          cost_price: "Cost Price"
           sku: "SKU"
           price: "Price"
           display_as: "Display As"
           display_name: "Display Name"
+          display_as_placeholder: 'For example, 2 kg'
+          display_name_placeholder: 'For example, Tomatoes'
         autocomplete:
           out_of_stock: "Out of Stock"
           producer_name: "Producer"
@@ -3235,6 +3297,7 @@ en_US:
       format: '%Y-%m-%d'
       js_format: 'yy-mm-dd'
     orders:
+      error_flash_for_unavailable_items: "An item in your cart has become unavailable. Please update the selected quantities."
       edit:
         login_to_view_order: "Please log in to view your order."
       bought:
@@ -3262,6 +3325,14 @@ en_US:
       invalid: Invalid
     order_mailer:
       cancel_email:
+        customer_greeting: "Dear %{name},"
+        instructions_html: "Your order with <strong>%{distributor}</strong> has been CANCELED. Please retain this cancellation information for your records."
+        dont_cancel: "If you have changed your mind or don't wish to cancel this order please contact %{email}"
+        order_summary_canceled_html: "<strong>Order Summary #%{number} [CANCELED]</strong>"
+        details: "Here are the details of what you ordered:"
+        unpaid_order: "Your order was unpaid so no refund has been made"
+        paid_order: "Your order was paid so %{distributor} has refunded the full amount"
+        credit_order: "Your order was paid so your account has been credited"
         subject: "Cancellation of Order"
       confirm_email:
         subject: "Order Confirmation"

config/locales/en_ZA.yml

@@ -1142,13 +1142,13 @@ en_ZA:
     menu:
       cart:
         cart: "Basket"
+      cart_sidebar:
+        checkout: "Checkout"
+        close: "Close"
       signed_in:
         profile: "Profile"
       mobile_menu:
         cart: "Basket"
-      joyride:
-        checkout: "Checkout now"
-        already_ordered_products: "Already ordered in this order cycle"
     register_call:
       selling_on_ofn: "Interested in selling through the Open Food Network?"
       register: "Register here"

config/locales/es.yml

@@ -1149,13 +1149,13 @@ es:
     menu:
       cart:
         cart: "Carrito"
+      cart_sidebar:
+        checkout: "Validar"
+        close: "Cerrar"
       signed_in:
         profile: "Perfil"
       mobile_menu:
         cart: "Carrito"
-      joyride:
-        checkout: "Validar el carrito ahora"
-        already_ordered_products: "Pedido en este ciclo de pedido"
     register_call:
       selling_on_ofn: "¿Estás interesada en entrar en Open Food Network?"
       register: "Regístrate aquí"

config/locales/es_CR.yml

@@ -1143,15 +1143,15 @@ es_CR:
     menu:
       cart:
         cart: "Carrito"
+      cart_sidebar:
+        checkout: "Validar el carrito"
+        close: "Cerrar"
       signed_in:
         profile: "Perfil"
       mobile_menu:
         cart: "Carrito"
-      joyride:
-        checkout: "Validar el carrito ahora"
-        already_ordered_products: "Pedido en este ciclo de pedido"
     register_call:
-      selling_on_ofn: "¿Quiere ser parte de Open Food Network (LaFeriaCR)?"
+      selling_on_ofn: "¿Tiene interés en vender a través de Open Food Network (LaFeriaCR)?"
       register: "Regístrarse aquí"
     footer:
       footer_secure: "Seguro y de confianza."

config/locales/fil_PH.yml

@@ -718,7 +718,7 @@ fil_PH:
               ito ay makikita sa home tab kapag ang customer ay nasa loob na ng inyong
               shopfront.
           shopfront_message_link_tooltip: "ilagay/ i-edit ang link"
-          shopfront_message_link_prompt: "ilagay ang URL na ipapasok"
+          shopfront_message_link_prompt: "ipasok ang URL na ilalagay"
           shopfront_closed_message: "pagsasarang mensahe ng Shopfront"
           shopfront_closed_message_placeholder: >
               isang mensahe na nagbibigay ng mas detalyadong paliwanag kung bakit
@@ -1035,7 +1035,7 @@ fil_PH:
       edit: i-edit ang subscription
       table:
         edit_subscription: i-edit ang subscription
-        pause_subscription: ihinto ang subscription
+        pause_subscription: panandaliang ihinto ang subscription
         unpause_subscription: ituloy ang subscription
         cancel_subscription: kanselahin ang nauulit na order
       filters:
@@ -1074,8 +1074,8 @@ fil_PH:
         allowed_payment_method_types_tip: Cash at pamamaraang Stripe lamang ang maaaring gamitin sa kasalukuyan.
         credit_card: Credit Card
         charges_not_allowed: ang paniningil ay hindi pinapayagan ng customer na ito
-        no_default_card: ang customer ay walang mga card na maaaring singilin
-        card_ok: ang customer ay may card na maaaring singilin
+        no_default_card: ang customer ay walang mga card na maaaring i-charge
+        card_ok: ang customer ay may card na maaaring i-charge
         begins_at_placeholder: "pumili ng petsa"
         ends_at_placeholder: "opsyonal"
       loading_flash:
@@ -1095,7 +1095,7 @@ fil_PH:
         out_of_stock: "Walang stock"
       orders:
         number: bilang
-        confirm_edit: sigurado ka bang nais mo ayusin ang order na ito? maaaring magdulot ito ng mas mahirap na awtomatikong pagsasaayos ng mga subscription sa hinaharap.
+        confirm_edit: sigurado ka bang nais mo i-edit ang order na ito? maaaring magdulot ito ng mas mahirap na awtomatikong pagsasaayos ng mga subscription sa hinaharap.
       confirm_cancel_msg: "sigurado ka bang nais mong kanselahin ang nauulit na order na ito? hindi na ito maaaring ibalik kapag nagawa na."
       cancel_failure_msg: "paumanhin ngunit hindi naging matagumpay ang pagkansela!"
       confirm_pause_msg: "sigurado ka bang nais mong pansamantalang itigil ang subscription na ito?"
@@ -1143,13 +1143,13 @@ fil_PH:
     menu:
       cart:
         cart: "Cart"
+      cart_sidebar:
+        checkout: "checkout"
+        close: "isara"
       signed_in:
         profile: "Profile"
       mobile_menu:
         cart: "Cart"
-      joyride:
-        checkout: "Mag-checkout na"
-        already_ordered_products: "Naka-order na sa order cycle na ito"
     register_call:
       selling_on_ofn: "Interesado ka ba maging parte ng Open Food Network?"
       register: "Magrehistro dito"
@@ -1175,7 +1175,7 @@ fil_PH:
       customer_required:
         login: "mag-log-in"
         signup: "mag-sign-up"
-        contact: "makipag-ugnay"
+        contact: "makipag-ugnayan"
         require_customer_login: "ang mga inaprubahang customer lamang ang maaaring gumamit ng shop na ito."
         require_customer_html: "kung nais mong magsimulang mamili rito, maaaring%{contact}%{enterprise} at magtanong kung paano sumali."
   card_could_not_be_updated: hindi ma-update ang card
@@ -1252,7 +1252,7 @@ fil_PH:
   state: province
   country: Bansa
   unauthorized: hindi awtorisado
-  terms_of_service: "mga palatuntunan ng serbisyo"
+  terms_of_service: "mga tuntunin ng serbisyo"
   on_demand: on demand
   none: wala
   not_allowed: hindi pinapayagan
@@ -1266,7 +1266,7 @@ fil_PH:
   label_shops: "mga shop"
   label_map: "mapa"
   label_producer: "Producer"
-  label_producers: "Producers"
+  label_producers: "Mga Producer"
   label_groups: "mga grupo"
   label_about: "tungkol sa"
   label_connect: "kumonekta"
@@ -1288,7 +1288,7 @@ fil_PH:
   total: "kabuuan"
   cart_updating: "ina-update ang cart"
   cart_empty: "walang laman ang cart"
-  cart_edit: "ayusin ang cart"
+  cart_edit: "i-edit ang cart"
   card_number: numero ng card
   card_securitycode: "Security code"
   card_expiry_date: petsa ng pag-expire
@@ -1297,15 +1297,15 @@ fil_PH:
   new_credit_card: "bagong credit card"
   my_credit_cards: ang aking mga credit card
   add_new_credit_card: magdagdag ng bagong credit card
-  saved_cards: i-save ang mga card
+  saved_cards: naka-save na mga card
   add_a_card: magdagdag ng card
   add_card: idagdag ang card
   you_have_no_saved_cards: wala ka pang nai-save na card.
   saving_credit_card: sine-save ang credit card...
-  card_has_been_removed: "ang iyong card ay tinanggal na (numero:%{number})"
-  card_could_not_be_removed: paumanhin, hindi maalis ang card
+  card_has_been_removed: "ang iyong card ay natanggal na (numero:%{number})"
+  card_could_not_be_removed: paumanhin, hindi matanggal ang card
   invalid_credit_card: "hindi valid ang credit card"
-  ie_warning_headline: "ang iyong browser ay luma na :-("
+  ie_warning_headline: "ang iyong browser ay out of date :-("
   ie_warning_text: "para sa pinakamagandang karanasan sa Open Food Network, mariin naming nirerekomenda ang pag-upgrade ng inyong browser:"
   ie_warning_chrome: i-download ang Chrome
   ie_warning_firefox: i-download ang Firefox
@@ -2381,7 +2381,7 @@ fil_PH:
               din ito upang maisalaysay ang inyong kwento.
           profile_only_text2: >
               kung mas nais mong magpokus sa paggawa ng pagkain at ipaubaya sa iba
-              ang pagbebenta nito, hindi kailangan ang shop sa Open Food Network.
+              ang pagbebenta nito, hindi na kailangan ang shop sa Open Food Network.
           profile_only_text3: >
               idagdag ang inyong produkto sa Open Food Network, upang mabigyan ng
               permiso ang mga hub na ilagay ang inyong produkto sa kanilang mga tindahan.
@@ -2390,9 +2390,9 @@ fil_PH:
               Direktang ibenta ang inyong produkto sa mga customer sa pamamagitan
               ng iyong sariling Open Food Network shopfront.
           producer_shop_text2: >
-              ang shop ng Producer ay para lamang sa iyong mga produkto, kung nais
-              mong magtinda ng mga produkto na itinanim/ginawa sa labas ng site, piliin
-              ang 'Hub ng producer'.
+              ang Producer Shop ay para lamang sa iyong mga produkto, kung nais mong
+              magtinda ng mga produkto na itinanim/ginawa sa labas ng site, piliin
+              ang 'Producer Hub'.
           producer_hub: Producer Hub
           producer_hub_text1: >
               ang iyong enterprise ang saligan ng iyong lokal na sistema ng pagkain.
@@ -2400,9 +2400,8 @@ fil_PH:
               pinagsama sama mula sa ibang enterprise sa pamamagitan ng iyong shopfront
               sa Open Food Network.
           producer_hub_text2: >
-              ang mga hub ng producer ay maaring may iba't ibang anyo tulad ng CSA,
-              isang programang veggie-box o isang co-op ng pagkain na may hardin sa
-              rooftop.
+              ang mga producer hub ay maaring may iba't ibang anyo tulad ng CSA, isang
+              programang veggie-box o isang co-op ng pagkain na may hardin sa rooftop.
           producer_hub_text3: >
               ang layunin ng Open Food Network ay sumuporta sa mga modelo ng hub gaano
               man ito karami, kaya ano man ang inyong sitwasyon, nais naming ibigay
@@ -2549,14 +2548,14 @@ fil_PH:
         'yes': "oo"
         'no': "hindi"
       inventory_products: "mga produktong naka-imbentaryo"
-      hidden_products: "mga nakatagong pprodukto"
-      new_products: "bagong produkto"
+      hidden_products: "nakatagong mga produkto"
+      new_products: "bagong mga produkto"
       reset_stock_levels: i-reset ang lebel ng stock sa default
       changes_to: mga pagbabago sa
       one_override: isang override
       overrides: mga override
       remain_unsaved: nananatiling hindi naka-save.
-      no_changes_to_save: walang pagbabago na ise-save
+      no_changes_to_save: walang mga pagbabago na ise-save
       no_authorisation: "hindi ko makuha ang awtorisasyon para i-save ang mga pagbabago kaya mananatili ang mga ito na hindi naka-save."
       some_trouble: "nagkaroon ako ng problema sa pagse-save: %{errors}"
       changing_on_hand_stock: pagbabago sa lebel ng hand stock

config/locales/fr.yml

@@ -1149,13 +1149,18 @@ fr:
     menu:
       cart:
         cart: "Panier"
+      cart_sidebar:
+        checkout: "Etape suivante (coordonnées)"
+        edit_cart: "Modifier le panier"
+        items_in_cart_singular: "%{num} élément dans le panier"
+        items_in_cart_plural: "%{num} éléments dans le panier"
+        close: "Fermer"
+        cart_empty: "Le panier est vide"
+        take_me_shopping: "Continuer mes achats"
       signed_in:
         profile: "Profil"
       mobile_menu:
         cart: "Panier"
-      joyride:
-        checkout: "Poursuivre la commande"
-        already_ordered_products: "Déjà commandé dans ce cycle de vente"
     register_call:
       selling_on_ofn: "Vous souhaitez proposer vos produits sur Open Food France?"
       register: "Démarrez ici"
@@ -1183,8 +1188,8 @@ fr:
         signup: "inscrivez-vous"
         contact: "contacter"
         require_customer_login: "Seul les acheteurs autorisés peuvent accéder à cette boutique."
-        require_login_html: "Si vous êtes déjà autorisé à accéder à la boutique, %{login}ou %{signup}pour continuer."
-        require_login_2_html: "Vous souhaitez réaliser vos courses ici? Merci de %{contact}%{enterprise} afin d'avoir l'autorisation d'accès à la boutique."
+        require_login_html: "Si vous êtes déjà autorisé à accéder à la boutique, %{login} ou %{signup} pour continuer."
+        require_login_2_html: "Vous souhaitez réaliser vos courses ici ? Merci de %{contact} %{enterprise} afin d'avoir l'autorisation d'accès à la boutique."
         require_customer_html: "Si vous voulez demander à y accéder, veuillez %{contact} %{enterprise}."
       select_oc:
         select_oc_html: "Merci de <span class='highlighted'>sélectionner une option dans la liste déroulante</span>, afin de voir quel produits sont disponibles."

config/locales/fr_BE.yml

@@ -1142,13 +1142,13 @@ fr_BE:
     menu:
       cart:
         cart: "Panier"
+      cart_sidebar:
+        checkout: "Etape suivante (coordonnées)"
+        close: "Ferme"
       signed_in:
         profile: "Profil"
       mobile_menu:
         cart: "Panier"
-      joyride:
-        checkout: "Passer la commande"
-        already_ordered_products: "Déjà commandé dans ce cycle de vente"
     register_call:
       selling_on_ofn: "Intéressé·e à vendre sur Open Food Network?"
       register: "Démarrez ici"

config/locales/fr_CA.yml

@@ -1148,13 +1148,13 @@ fr_CA:
     menu:
       cart:
         cart: "Panier"
+      cart_sidebar:
+        checkout: "Finalisation commande"
+        close: "Ferme"
       signed_in:
         profile: "Profil"
       mobile_menu:
         cart: "Panier"
-      joyride:
-        checkout: "Passer la commande"
-        already_ordered_products: "Déjà commandé dans ce cycle de vente"
     register_call:
       selling_on_ofn: "Vous souhaitez proposer vos produits sur Open Food Network?"
       register: "Démarrez ici"

config/locales/it.yml

@@ -1148,13 +1148,13 @@ it:
     menu:
       cart:
         cart: "Carrello"
+      cart_sidebar:
+        checkout: "Paga"
+        close: "Chiuso"
       signed_in:
         profile: "Profilo"
       mobile_menu:
         cart: "Carrello"
-      joyride:
-        checkout: "Checkout adesso"
-        already_ordered_products: "Già richiesto in questo ciclo di richieste"
     register_call:
       selling_on_ofn: "Interessato ad entrare in Open Food Network?"
       register: "Registrati qui"

config/locales/nb.yml

@@ -1147,13 +1147,13 @@ nb:
     menu:
       cart:
         cart: "Handlekurv"
+      cart_sidebar:
+        checkout: "Kassen"
+        close: "Lukk"
       signed_in:
         profile: "Profil"
       mobile_menu:
         cart: "Handlekurv"
-      joyride:
-        checkout: "Sjekk ut nå"
-        already_ordered_products: "Allerede bestilt i denne bestillingssyklusen"
     register_call:
       selling_on_ofn: "Interessert i å bli med i Open Food Network?"
       register: "Registrer her"

config/locales/nl_BE.yml

@@ -1102,13 +1102,13 @@ nl_BE:
     menu:
       cart:
         cart: "kar"
+      cart_sidebar:
+        checkout: "Kassa"
+        close: "Sluit"
       signed_in:
         profile: "Profiel"
       mobile_menu:
         cart: "kar"
-      joyride:
-        checkout: "Naar de kassa"
-        already_ordered_products: "Reeds besteld in de huidige bestelcyclus"
     register_call:
       selling_on_ofn: "Geïnteresseerd om deel uit te maken van het Open Food Network?"
       register: "Registreer hier"

config/locales/pt.yml

@@ -1082,11 +1082,11 @@ pt:
       show_on_map: "Mostrar todas as lojas no mapa"
   shared:
     menu:
+      cart_sidebar:
+        checkout: "Finalizar compra"
+        close: "Fechar"
       signed_in:
         profile: "Perfil"
-      joyride:
-        checkout: "Finalizar compra agora"
-        already_ordered_products: "Já encomendado neste ciclo de encomendas"
     register_call:
       selling_on_ofn: "Tem interesse em participar na Open Food Network?"
       register: "Registe-se aqui"

config/locales/pt_BR.yml

@@ -1141,13 +1141,13 @@ pt_BR:
     menu:
       cart:
         cart: "Carrinho"
+      cart_sidebar:
+        checkout: "Fechar pedido"
+        close: "Fechado"
       signed_in:
         profile: "Perfil"
       mobile_menu:
         cart: "Carrinho"
-      joyride:
-        checkout: "Fechar pedido agora"
-        already_ordered_products: "Já pediu neste ciclo de pedidos"
     register_call:
       selling_on_ofn: "Interessado em registrar a sua iniciativa na Open Food Brasil?"
       register: "Registre-se aqui"

config/locales/sv.yml

@@ -633,11 +633,11 @@ sv:
       show_on_map: "Visa allt på kartan"
   shared:
     menu:
+      cart_sidebar:
+        checkout: "Utcheckning"
+        close: "Stängd"
       signed_in:
         profile: "Profil"
-      joyride:
-        checkout: "Slutför beställning"
-        already_ordered_products: "Redan beställd i denna beställningsomgång"
     register_call:
       selling_on_ofn: "Intresserad av att gå med i Open Food Network?"
       register: "Registrera dig här"

config/locales/tr.yml

@@ -370,7 +370,10 @@ tr:
         title: "Matomo Ayarları"
         matomo_url: "Matomo URL'si"
         matomo_site_id: "Matomo Site Kimliği"
+        matomo_tag_manager_url: "Matomo Tag Manager URL"
+        info_html: "Matomo, Web ve Mobil Analitik uygulamasıdır. Daha fazla bilgi için <a href='http://matomo.org' target='_blank'>matomo.org</a> sitesini ziyaret edin."
         config_instructions_html: "Burada OFN Matomo entegrasyonunu yapılandırabilirsiniz. Aşağıdaki Matomo URL'si, kullanıcı izleme bilgilerinin gönderileceği Matomo örneğini göstermelidir; boş bırakılırsa Matomo kullanıcı takibi devre dışı bırakılır. Site Kimliği alanı zorunlu değildir, ancak tek bir Matomo örneğinde birden fazla web sitesini izliyorsanız yararlıdır; Matomo örnek konsolunda bulunabilir."
+        config_instructions_tag_manager_html: "Setting the Matomo Tag Manager URL enables Matomo Tag Manager. This tool allows you to set up analytics events. The Matomo Tag Manager URL is copied from the Install Code section of Matomo Tag Manager. Ensure you select the right container and environment as these options change the URL."
     customers:
       index:
         new_customer: "Yeni Müşteri"
@@ -476,6 +479,7 @@ tr:
         line_number: "%{number}. satır:"
         encoding_error: "Lütfen kaynak dosyanızın dil ayarını kontrol edin ve UTF-8 kodlamasıyla kaydedildiğinden emin olun"
         unexpected_error: "Ürün içe aktarımında dosyayı açarken beklenmeyen bir hatayla karşılaşıldı: %{error_message}"
+        malformed_csv: "Ürün içe aktarımında CSV biçim hatası ile karşılaşıldı: %{error_message}"
       index:
         notice: "Dikkat"
         beta_notice: "Bu özellik hala beta sürümündedir: kullanırken bazı hatalarla karşılaşabilirsiniz. Lütfen teknik destek için iletişime geçmekten çekinmeyin."
@@ -1142,13 +1146,13 @@ tr:
     menu:
       cart:
         cart: "Sepet"
+      cart_sidebar:
+        checkout: "Ödeme Yap"
+        close: "KAPANIŞ"
       signed_in:
         profile: "Profil"
       mobile_menu:
         cart: "Sepet"
-      joyride:
-        checkout: "Alışverişi Tamamla"
-        already_ordered_products: "Bu sipariş dönemi içinde zaten sipariş verildi"
     register_call:
       selling_on_ofn: "Açık Gıda Ağı üzerinden satış yapmak ister misiniz?"
       register: "Buradan kaydolun"
@@ -2939,7 +2943,7 @@ tr:
         errors_prohibited_this_record_from_being_saved:
           one: "1 hata kaydedilmesini engelledi:"
           other: "%{count}hata kaydedilmeyi engelledi:"
-        there_were_problems_with_the_following_fields: "Gösterilen alanlar ile ilgili sorun oluştu:"
+        there_were_problems_with_the_following_fields: "Belirtilen alanlar ile ilgili sorun oluştu:"
     errors:
       messages:
         blank: "boş olamaz"
@@ -3251,7 +3255,7 @@ tr:
           display_as_placeholder: 'örn. 2 kg'
           display_name_placeholder: 'örn. Domates'
         autocomplete:
-          out_of_stock: "Stok tükendi"
+          out_of_stock: "Stokta Yok"
           producer_name: "Üretici"
           unit: "Birim"
       shared:

db/migrate/20200623140437_fix_preferences_keys.rb

@@ -0,0 +1,16 @@
+class FixPreferencesKeys < ActiveRecord::Migration
+  def up
+    unmigrated_preferences = Spree::Preference.exists?(['key NOT LIKE ?', '/%'])
+    return unless unmigrated_preferences
+
+    new_preferences = Spree::Preference.where("key LIKE '/%'")
+    new_preferences.delete_all
+
+    Spree::Preference.update_all("key = '/' || key")
+
+    Rails.cache.clear
+  end
+
+  def down
+  end
+end

db/migrate/20200624091611_make_timestamps_nullable.rb

@@ -0,0 +1,251 @@
+class MakeTimestampsNullable < ActiveRecord::Migration
+  def up
+    change_column_null :customers, :created_at, true
+    change_column_null :customers, :updated_at, true
+    change_column_null :delayed_jobs, :created_at, true
+    change_column_null :delayed_jobs, :updated_at, true
+    change_column_null :distributors_shipping_methods, :created_at, true
+    change_column_null :distributors_shipping_methods, :updated_at, true
+    change_column_null :enterprise_fees, :created_at, true
+    change_column_null :enterprise_fees, :updated_at, true
+    change_column_null :enterprises, :created_at, true
+    change_column_null :enterprises, :updated_at, true
+    change_column_null :exchange_fees, :created_at, true
+    change_column_null :exchange_fees, :updated_at, true
+    change_column_null :exchange_variants, :created_at, true
+    change_column_null :exchange_variants, :updated_at, true
+    change_column_null :exchanges, :created_at, true
+    change_column_null :exchanges, :updated_at, true
+    change_column_null :inventory_items, :created_at, true
+    change_column_null :inventory_items, :updated_at, true
+    change_column_null :order_cycle_schedules, :created_at, true
+    change_column_null :order_cycle_schedules, :updated_at, true
+    change_column_null :order_cycles, :created_at, true
+    change_column_null :order_cycles, :updated_at, true
+    change_column_null :producer_properties, :created_at, true
+    change_column_null :producer_properties, :updated_at, true
+    change_column_null :proxy_orders, :created_at, true
+    change_column_null :proxy_orders, :updated_at, true
+    change_column_null :schedules, :created_at, true
+    change_column_null :schedules, :updated_at, true
+    change_column_null :sessions, :created_at, true
+    change_column_null :sessions, :updated_at, true
+    change_column_null :spree_activators, :created_at, true
+    change_column_null :spree_activators, :updated_at, true
+    change_column_null :spree_addresses, :created_at, true
+    change_column_null :spree_addresses, :updated_at, true
+    change_column_null :spree_adjustments, :created_at, true
+    change_column_null :spree_adjustments, :updated_at, true
+    change_column_null :spree_calculators, :created_at, true
+    change_column_null :spree_calculators, :updated_at, true
+    change_column_null :spree_configurations, :created_at, true
+    change_column_null :spree_configurations, :updated_at, true
+    change_column_null :spree_credit_cards, :created_at, true
+    change_column_null :spree_credit_cards, :updated_at, true
+    change_column_null :spree_gateways, :created_at, true
+    change_column_null :spree_gateways, :updated_at, true
+    change_column_null :spree_inventory_units, :created_at, true
+    change_column_null :spree_inventory_units, :updated_at, true
+    change_column_null :spree_line_items, :created_at, true
+    change_column_null :spree_line_items, :updated_at, true
+    change_column_null :spree_log_entries, :created_at, true
+    change_column_null :spree_log_entries, :updated_at, true
+    change_column_null :spree_option_types, :created_at, true
+    change_column_null :spree_option_types, :updated_at, true
+    change_column_null :spree_option_values, :created_at, true
+    change_column_null :spree_option_values, :updated_at, true
+    change_column_null :spree_orders, :created_at, true
+    change_column_null :spree_orders, :updated_at, true
+    change_column_null :spree_payment_methods, :created_at, true
+    change_column_null :spree_payment_methods, :updated_at, true
+    change_column_null :spree_payments, :created_at, true
+    change_column_null :spree_payments, :updated_at, true
+    change_column_null :spree_preferences, :created_at, true
+    change_column_null :spree_preferences, :updated_at, true
+    change_column_null :spree_product_option_types, :created_at, true
+    change_column_null :spree_product_option_types, :updated_at, true
+    change_column_null :spree_product_properties, :created_at, true
+    change_column_null :spree_product_properties, :updated_at, true
+    change_column_null :spree_products, :created_at, true
+    change_column_null :spree_products, :updated_at, true
+    change_column_null :spree_promotion_rules, :created_at, true
+    change_column_null :spree_promotion_rules, :updated_at, true
+    change_column_null :spree_properties, :created_at, true
+    change_column_null :spree_properties, :updated_at, true
+    change_column_null :spree_return_authorizations, :created_at, true
+    change_column_null :spree_return_authorizations, :updated_at, true
+    change_column_null :spree_shipments, :created_at, true
+    change_column_null :spree_shipments, :updated_at, true
+    change_column_null :spree_shipping_categories, :created_at, true
+    change_column_null :spree_shipping_categories, :updated_at, true
+    change_column_null :spree_shipping_method_categories, :created_at, true
+    change_column_null :spree_shipping_method_categories, :updated_at, true
+    change_column_null :spree_shipping_methods, :created_at, true
+    change_column_null :spree_shipping_methods, :updated_at, true
+    change_column_null :spree_shipping_rates, :created_at, true
+    change_column_null :spree_shipping_rates, :updated_at, true
+    change_column_null :spree_skrill_transactions, :created_at, true
+    change_column_null :spree_skrill_transactions, :updated_at, true
+    change_column_null :spree_state_changes, :created_at, true
+    change_column_null :spree_state_changes, :updated_at, true
+    change_column_null :spree_stock_items, :created_at, true
+    change_column_null :spree_stock_items, :updated_at, true
+    change_column_null :spree_stock_locations, :created_at, true
+    change_column_null :spree_stock_locations, :updated_at, true
+    change_column_null :spree_stock_movements, :created_at, true
+    change_column_null :spree_stock_movements, :updated_at, true
+    change_column_null :spree_stock_transfers, :created_at, true
+    change_column_null :spree_stock_transfers, :updated_at, true
+    change_column_null :spree_tax_categories, :created_at, true
+    change_column_null :spree_tax_categories, :updated_at, true
+    change_column_null :spree_tax_rates, :created_at, true
+    change_column_null :spree_tax_rates, :updated_at, true
+    change_column_null :spree_taxonomies, :created_at, true
+    change_column_null :spree_taxonomies, :updated_at, true
+    change_column_null :spree_taxons, :created_at, true
+    change_column_null :spree_taxons, :updated_at, true
+    change_column_null :spree_tokenized_permissions, :created_at, true
+    change_column_null :spree_tokenized_permissions, :updated_at, true
+    change_column_null :spree_users, :created_at, true
+    change_column_null :spree_users, :updated_at, true
+    change_column_null :spree_zone_members, :created_at, true
+    change_column_null :spree_zone_members, :updated_at, true
+    change_column_null :spree_zones, :created_at, true
+    change_column_null :spree_zones, :updated_at, true
+    change_column_null :stripe_accounts, :created_at, true
+    change_column_null :stripe_accounts, :updated_at, true
+    change_column_null :subscription_line_items, :created_at, true
+    change_column_null :subscription_line_items, :updated_at, true
+    change_column_null :subscriptions, :created_at, true
+    change_column_null :subscriptions, :updated_at, true
+    change_column_null :tag_rules, :created_at, true
+    change_column_null :tag_rules, :updated_at, true
+    change_column_null :column_preferences, :created_at, true
+    change_column_null :column_preferences, :updated_at, true
+  end
+
+  def down
+    change_column_null :customers, :created_at, false
+    change_column_null :customers, :updated_at, false
+    change_column_null :delayed_jobs, :created_at, false
+    change_column_null :delayed_jobs, :updated_at, false
+    change_column_null :distributors_shipping_methods, :created_at, false
+    change_column_null :distributors_shipping_methods, :updated_at, false
+    change_column_null :enterprise_fees, :created_at, false
+    change_column_null :enterprise_fees, :updated_at, false
+    change_column_null :enterprises, :created_at, false
+    change_column_null :enterprises, :updated_at, false
+    change_column_null :exchange_fees, :created_at, false
+    change_column_null :exchange_fees, :updated_at, false
+    change_column_null :exchange_variants, :created_at, false
+    change_column_null :exchange_variants, :updated_at, false
+    change_column_null :exchanges, :created_at, false
+    change_column_null :exchanges, :updated_at, false
+    change_column_null :inventory_items, :created_at, false
+    change_column_null :inventory_items, :updated_at, false
+    change_column_null :order_cycle_schedules, :created_at, false
+    change_column_null :order_cycle_schedules, :updated_at, false
+    change_column_null :order_cycles, :created_at, false
+    change_column_null :order_cycles, :updated_at, false
+    change_column_null :producer_properties, :created_at, false
+    change_column_null :producer_properties, :updated_at, false
+    change_column_null :proxy_orders, :created_at, false
+    change_column_null :proxy_orders, :updated_at, false
+    change_column_null :schedules, :created_at, false
+    change_column_null :schedules, :updated_at, false
+    change_column_null :sessions, :created_at, false
+    change_column_null :sessions, :updated_at, false
+    change_column_null :spree_activators, :created_at, false
+    change_column_null :spree_activators, :updated_at, false
+    change_column_null :spree_addresses, :created_at, false
+    change_column_null :spree_addresses, :updated_at, false
+    change_column_null :spree_adjustments, :created_at, false
+    change_column_null :spree_adjustments, :updated_at, false
+    change_column_null :spree_calculators, :created_at, false
+    change_column_null :spree_calculators, :updated_at, false
+    change_column_null :spree_configurations, :created_at, false
+    change_column_null :spree_configurations, :updated_at, false
+    change_column_null :spree_credit_cards, :created_at, false
+    change_column_null :spree_credit_cards, :updated_at, false
+    change_column_null :spree_gateways, :created_at, false
+    change_column_null :spree_gateways, :updated_at, false
+    change_column_null :spree_inventory_units, :created_at, false
+    change_column_null :spree_inventory_units, :updated_at, false
+    change_column_null :spree_line_items, :created_at, false
+    change_column_null :spree_line_items, :updated_at, false
+    change_column_null :spree_log_entries, :created_at, false
+    change_column_null :spree_log_entries, :updated_at, false
+    change_column_null :spree_option_types, :created_at, false
+    change_column_null :spree_option_types, :updated_at, false
+    change_column_null :spree_option_values, :created_at, false
+    change_column_null :spree_option_values, :updated_at, false
+    change_column_null :spree_orders, :created_at, false
+    change_column_null :spree_orders, :updated_at, false
+    change_column_null :spree_payment_methods, :created_at, false
+    change_column_null :spree_payment_methods, :updated_at, false
+    change_column_null :spree_payments, :created_at, false
+    change_column_null :spree_payments, :updated_at, false
+    change_column_null :spree_preferences, :created_at, false
+    change_column_null :spree_preferences, :updated_at, false
+    change_column_null :spree_product_option_types, :created_at, false
+    change_column_null :spree_product_option_types, :updated_at, false
+    change_column_null :spree_product_properties, :created_at, false
+    change_column_null :spree_product_properties, :updated_at, false
+    change_column_null :spree_products, :created_at, false
+    change_column_null :spree_products, :updated_at, false
+    change_column_null :spree_promotion_rules, :created_at, false
+    change_column_null :spree_promotion_rules, :updated_at, false
+    change_column_null :spree_properties, :created_at, false
+    change_column_null :spree_properties, :updated_at, false
+    change_column_null :spree_return_authorizations, :created_at, false
+    change_column_null :spree_return_authorizations, :updated_at, false
+    change_column_null :spree_shipments, :created_at, false
+    change_column_null :spree_shipments, :updated_at, false
+    change_column_null :spree_shipping_categories, :created_at, false
+    change_column_null :spree_shipping_categories, :updated_at, false
+    change_column_null :spree_shipping_method_categories, :created_at, false
+    change_column_null :spree_shipping_method_categories, :updated_at, false
+    change_column_null :spree_shipping_methods, :created_at, false
+    change_column_null :spree_shipping_methods, :updated_at, false
+    change_column_null :spree_shipping_rates, :created_at, false
+    change_column_null :spree_shipping_rates, :updated_at, false
+    change_column_null :spree_skrill_transactions, :created_at, false
+    change_column_null :spree_skrill_transactions, :updated_at, false
+    change_column_null :spree_state_changes, :created_at, false
+    change_column_null :spree_state_changes, :updated_at, false
+    change_column_null :spree_stock_items, :created_at, false
+    change_column_null :spree_stock_items, :updated_at, false
+    change_column_null :spree_stock_locations, :created_at, false
+    change_column_null :spree_stock_locations, :updated_at, false
+    change_column_null :spree_stock_movements, :created_at, false
+    change_column_null :spree_stock_movements, :updated_at, false
+    change_column_null :spree_stock_transfers, :created_at, false
+    change_column_null :spree_stock_transfers, :updated_at, false
+    change_column_null :spree_tax_categories, :created_at, false
+    change_column_null :spree_tax_categories, :updated_at, false
+    change_column_null :spree_tax_rates, :created_at, false
+    change_column_null :spree_tax_rates, :updated_at, false
+    change_column_null :spree_taxonomies, :created_at, false
+    change_column_null :spree_taxonomies, :updated_at, false
+    change_column_null :spree_taxons, :created_at, false
+    change_column_null :spree_taxons, :updated_at, false
+    change_column_null :spree_tokenized_permissions, :created_at, false
+    change_column_null :spree_tokenized_permissions, :updated_at, false
+    change_column_null :spree_users, :created_at, false
+    change_column_null :spree_users, :updated_at, false
+    change_column_null :spree_zone_members, :created_at, false
+    change_column_null :spree_zone_members, :updated_at, false
+    change_column_null :spree_zones, :created_at, false
+    change_column_null :spree_zones, :updated_at, false
+    change_column_null :stripe_accounts, :created_at, false
+    change_column_null :stripe_accounts, :updated_at, false
+    change_column_null :subscription_line_items, :created_at, false
+    change_column_null :subscription_line_items, :updated_at, false
+    change_column_null :subscriptions, :created_at, false
+    change_column_null :subscriptions, :updated_at, false
+    change_column_null :tag_rules, :created_at, false
+    change_column_null :tag_rules, :updated_at, false
+    change_column_null :column_preferences, :created_at, false
+    change_column_null :column_preferences, :updated_at, false
+  end   
+end

db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20200508101630) do
+ActiveRecord::Schema.define(version: 20200624091611) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -273,8 +273,8 @@ ActiveRecord::Schema.define(version: 20200508101630) do
   add_index "inventory_items", ["enterprise_id", "variant_id"], name: "index_inventory_items_on_enterprise_id_and_variant_id", unique: true, using: :btree
 
   create_table "order_cycle_schedules", force: true do |t|
-    t.integer "order_cycle_id", null: false
-    t.integer "schedule_id",    null: false
+    t.integer  "order_cycle_id", null: false
+    t.integer  "schedule_id",    null: false
     t.datetime "created_at"
     t.datetime "updated_at"
   end
@@ -570,8 +570,8 @@ ActiveRecord::Schema.define(version: 20200508101630) do
 
   add_index "spree_orders", ["completed_at", "user_id", "created_by_id", "created_at"], name: "spree_orders_completed_at_user_id_created_by_id_created_at_idx", using: :btree
   add_index "spree_orders", ["customer_id"], name: "index_spree_orders_on_customer_id", using: :btree
-  add_index "spree_orders", ["number"], name: "index_orders_on_number", using: :btree
   add_index "spree_orders", ["distributor_id"], name: "index_spree_orders_on_distributor_id", using: :btree
+  add_index "spree_orders", ["number"], name: "index_orders_on_number", using: :btree
   add_index "spree_orders", ["order_cycle_id"], name: "index_spree_orders_on_order_cycle_id", using: :btree
   add_index "spree_orders", ["user_id"], name: "index_spree_orders_on_user_id", using: :btree
 
@@ -644,9 +644,9 @@ ActiveRecord::Schema.define(version: 20200508101630) do
   add_index "spree_preferences", ["key"], name: "index_spree_preferences_on_key", unique: true, using: :btree
 
   create_table "spree_prices", force: true do |t|
-    t.integer "variant_id",                         null: false
-    t.decimal "amount",     precision: 8, scale: 2
-    t.string  "currency"
+    t.integer  "variant_id",                         null: false
+    t.decimal  "amount",     precision: 8, scale: 2
+    t.string   "currency"
     t.datetime "deleted_at"
   end
 
@@ -723,7 +723,7 @@ ActiveRecord::Schema.define(version: 20200508101630) do
   add_index "spree_products", ["permalink"], name: "index_products_on_permalink", using: :btree
   add_index "spree_products", ["permalink"], name: "permalink_idx_unique", unique: true, using: :btree
   add_index "spree_products", ["primary_taxon_id"], name: "index_spree_products_on_primary_taxon_id", using: :btree
-  add_index "spree_products", ["supplier_id"], name: "index_spree_products_on_supplier_id"
+  add_index "spree_products", ["supplier_id"], name: "index_spree_products_on_supplier_id", using: :btree
 
   create_table "spree_products_promotion_rules", id: false, force: true do |t|
     t.integer "product_id"
@@ -1189,9 +1189,9 @@ ActiveRecord::Schema.define(version: 20200508101630) do
   add_index "variant_overrides", ["variant_id", "hub_id"], name: "index_variant_overrides_on_variant_id_and_hub_id", using: :btree
 
   create_table "versions", force: true do |t|
-    t.string   "item_type",  null: false
-    t.integer  "item_id",    null: false
-    t.string   "event",      null: false
+    t.string   "item_type",   null: false
+    t.integer  "item_id",     null: false
+    t.string   "event",       null: false
     t.string   "whodunnit"
     t.text     "object"
     t.datetime "created_at"