spree_core 4.3.3 → 4.4.0.rc1

data/app/services/spree/shipments/change_state.rb

@@ -0,0 +1,14 @@
+module Spree
+  module Shipments
+    class ChangeState
+      prepend Spree::ServiceModule::Base
+
+      def call(shipment:, state:)
+        shipment.send("#{state}!")
+        success(shipment.reload)
+      rescue ActiveRecord::Rollback, ActiveRecord::RecordInvalid, StateMachines::InvalidTransition
+        failure(shipment)
+      end
+    end
+  end
+end

data/app/services/spree/shipments/create.rb

@@ -0,0 +1,48 @@
+# creates new shipment record
+# if selected item (variant) is already added to order it will update line item
+# if not - it will create new line item record
+module Spree
+  module Shipments
+    class Create
+      prepend Spree::ServiceModule::Base
+      include Helper
+
+      def call(store:, shipment_attributes:)
+        ActiveRecord::Base.transaction do
+          run :prepare_arguments
+          run :create_shipment
+          run :add_or_update_line_item
+        end
+      end
+
+      protected
+
+      def prepare_arguments(store:, shipment_attributes:)
+        order_id_or_number = shipment_attributes[:order_id]
+        order = store.orders.find_by(number: order_id_or_number) || store.orders.find_by(id: order_id_or_number)
+
+        return failure(nil, :order_not_found) if order.nil?
+
+        variant = store.variants.find_by(id: shipment_attributes[:variant_id])
+        return failure(nil, :variant_not_found) if variant.nil?
+
+        stock_location = Spree::StockLocation.find_by(id: shipment_attributes[:stock_location_id])
+        return failure(nil, :stock_location_not_found) if stock_location.nil?
+
+        quantity = shipment_attributes[:quantity]&.to_i || 1
+
+        success(order: order, stock_location: stock_location, variant: variant, quantity: quantity)
+      end
+
+      def create_shipment(order:, stock_location:, variant:, quantity:)
+        shipment = order.shipments.create(
+          order_id: order.id,
+          stock_location_id: stock_location.id
+        )
+        return failure(shipment) unless shipment.persisted?
+
+        success(order: order, variant: variant, quantity: quantity, shipment: shipment)
+      end
+    end
+  end
+end

data/app/services/spree/shipments/helper.rb

@@ -0,0 +1,23 @@
+module Spree
+  module Shipments
+    module Helper
+      def add_or_update_line_item(order:, variant:, quantity:, shipment:)
+        result = add_item_service.call(order: order, variant: variant, quantity: quantity, options: { shipment: shipment })
+
+        if result.success?
+          success(shipment.reload)
+        else
+          failure(result.value, result.error)
+        end
+      end
+
+      def add_item_service
+        Spree::Dependencies.cart_add_item_service.constantize
+      end
+
+      def remove_item_service
+        Spree::Dependencies.cart_remove_item_service.constantize
+      end
+    end
+  end
+end

data/app/services/spree/shipments/remove_item.rb

@@ -0,0 +1,55 @@
+# removes an item (variant) from shipment
+# quantity can be passed
+# if there is no quantity left for this item for this shipent, shipment itself will be removed
+module Spree
+  module Shipments
+    class RemoveItem
+      prepend Spree::ServiceModule::Base
+      include Helper
+
+      def call(shipment:, variant_id:, quantity: nil)
+        ActiveRecord::Base.transaction do
+          run :prepare_arguments
+          run :remove_item
+        end
+      end
+
+      protected
+
+      def prepare_arguments(shipment:, variant_id:, quantity: nil)
+        variant = Spree::Variant.find_by(id: variant_id)
+        return failure(nil, :variant_not_found) if variant.nil? || !shipment.include?(variant)
+
+        # if quantity isn't passed let's remove all added qty of this variant
+        quantity = quantity&.to_i || shipment.inventory_units_for(variant).sum(:quantity)
+
+        success(shipment: shipment, variant: variant, quantity: quantity)
+      end
+
+      # if the removed variant was the only one shipped via this shipment
+      # we need to remove the shipment itself
+      def remove_item(shipment:, variant:, quantity:)
+        result = remove_item_service.call(order: shipment.order,
+                                          variant: variant,
+                                          quantity: quantity,
+                                          options: { shipment: shipment })
+
+        if result.success?
+          line_item = result.value
+          line_item.destroy if line_item.quantity.zero?
+
+          # `OrderInventory#remove_from_shipment` is called in `remove_item_service`
+          # which will delete the shipment if all inventory units were removed
+          if shipment.inventory_units.any?
+            success(shipment)
+          else
+            shipment.destroy!
+            success(:shipment_deleted)
+          end
+        else
+          failure(result.value, result.error)
+        end
+      end
+    end
+  end
+end

data/app/services/spree/shipments/update.rb

@@ -0,0 +1,40 @@
+# Update Shipment and make sure Order states follow the shipment changes
+module Spree
+  module Shipments
+    class Update
+      prepend Spree::ServiceModule::Base
+
+      def call(shipment:, shipment_attributes: {})
+        ActiveRecord::Base.transaction do
+          return failure(shipment) unless shipment.update(shipment_attributes)
+
+          if shipment_attributes.key?(:selected_shipping_rate_id)
+            order = shipment.order
+
+            # Changing the selected Shipping Rate won't update the cost (for now)
+            # so we persist the Shipment#cost before calculating order shipment
+            # total and updating payment state (given a change in shipment cost
+            # might change the Order#payment_state)
+            shipment.update_amounts
+
+            order.updater.update_shipment_total
+            order.updater.update_payment_state
+
+            # Update shipment state only after order total is updated because it
+            # (via Order#paid?) affects the shipment state (YAY)
+            shipment.update_columns(
+              state: shipment.determine_state(order),
+              updated_at: Time.current
+            )
+
+            # And then it's time to update shipment states and finally persist
+            # order changes
+            order.updater.update_shipment_state
+            order.updater.persist_totals
+          end
+        end
+        success(shipment)
+      end
+    end
+  end
+end

data/app/services/spree/stock_locations/stock_items/create.rb

@@ -0,0 +1,31 @@
+module Spree
+  module StockLocations
+    module StockItems
+      class Create
+        prepend Spree::ServiceModule::Base
+
+        def call(stock_location:, variants_scope: Spree::Variant)
+          if Rails::VERSION::MAJOR >= 6
+            prepared_stock_items = variants_scope.ids.map do |variant_id|
+              Hash[
+                'stock_location_id', stock_location.id,
+                'variant_id', variant_id,
+                'backorderable', stock_location.backorderable_default,
+                'created_at', Time.current,
+                'updated_at', Time.current
+              ]
+            end
+            if prepared_stock_items.any?
+              stock_location.stock_items.insert_all(prepared_stock_items)
+              variants_scope.touch_all
+            end
+          else
+            variants_scope.find_each do |variant|
+              stock_location.propagate_variant(variant)
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/app/services/spree/wallet/create_payment_source.rb

@@ -0,0 +1,26 @@
+module Spree
+  module Wallet
+    class CreatePaymentSource
+      prepend Spree::ServiceModule::Base
+
+      def call(payment_method:, params: {}, user: nil)
+        return failure(nil, :missing_attributes) if params.nil?
+
+        source_attributes = {
+          payment_method_id: payment_method.id,
+          user_id: user&.id,
+          gateway_payment_profile_id: params[:gateway_payment_profile_id],
+          gateway_customer_profile_id: params[:gateway_customer_profile_id],
+          last_digits: params[:last_digits],
+          month: params[:month],
+          year: params[:year],
+          name: params[:name]
+        }
+
+        source = payment_method.payment_source_class.new(source_attributes)
+
+        source.save ? success(source) : failure(source)
+      end
+    end
+  end
+end

data/app/validators/spree/url_validator.rb

@@ -0,0 +1,23 @@
+module Spree
+  class UrlValidator < ActiveModel::EachValidator
+    def validate_each(record, attribute, value)
+      unless url_valid?(value)
+        record.errors.add(attribute, (options[:message] || ERROR_MESSAGE))
+      end
+    end
+
+    private
+
+    ERROR_MESSAGE = 'must be a valid URL'
+    private_constant :ERROR_MESSAGE
+
+    def url_valid?(url)
+      uri = begin
+        URI.parse(url)
+      rescue URI::InvalidURIError
+        return false
+      end
+      uri.host.present? && uri.is_a?(URI::HTTP)
+    end
+  end
+end

data/brakeman.ignore

@@ -0,0 +1,20 @@
+{
+    "ignored_warnings": [
+        {
+          "fingerprint": "011b2643940ba1112f7a737e403abe3616ad91764703c801cc35a48d36b721da",
+          "note": "interpolating table name"
+        },
+        {
+          "fingerprint": "965d3919f811ab63b7b8d62da528559a7f38dc122c57efea7136e7ec5ef1f062",
+          "note": "interpolating table name"
+        },
+        {
+          "fingerprint": "abd8e90e7a7dfbcdcd6d44fd3fb550598aee6d7a9ef2bb132ad1a18a3c50be30",
+          "note": "interpolating table name"
+        },
+        {
+          "fingerprint": "efcc57e1a5648d7db59d1beaf5e399d2278539a8667b19c520b305a6ca7e15e8",
+          "note": "interpolating table name"
+        }
+    ]
+}

data/config/initializers/active_storage.rb

@@ -1,7 +1 @@
-class ActiveStorage::PurgeJob < ActiveStorage::BaseJob
-  def perform(blob)
-    blob.purge unless blob.attachments.present?
-  end
-end
-
 Rails.application.config.active_storage.content_types_to_serve_as_binary.delete('image/svg+xml')

data/config/locales/en.yml

@@ -382,7 +382,7 @@ en:
         spree/store:
           attributes:
             base:
-              cannot_destroy_default_store: Cannot destroy the default Store.
+              cannot_destroy_only_store: Cannot destroy the only Store.
         spree/store_credit:
           attributes:
             amount_used:
@@ -554,173 +554,9 @@ en:
     adjustment_successfully_opened: Adjustment has been successfully opened!
     adjustment_total: Adjustment Total
     adjustments: Adjustments
-    admin:
-      cms:
-        all_pages: All Pages
-        add_new_page: Add New Page
-        add_new_section: Add New Section
-        content: Content
-        click_here: click here
-        draft_mode: Draft Mode
-        full_width: Full width
-        link_to_taxon: Link to Taxon
-        link_to_product: Link to Product
-        title: Title
-        fit: Fit To
-        info_hero_image_body: "<p>The Hero Image section adds a large image with a button and tagline text to your page.</p>
-        <p>The button can link to a Product, Taxon or Page. This section can be set to fit within the central container or to the edges of the screen.</p>
-        <p><b>Tip:</b> Use a hero image with no button text or title, and then set the <b>Fit:</b> to <b>Container</b> and <b>Gutters</b> to <b>Use Gutters</b> this creates an image section that looks great above a Side-by-Side Images section, or an Image Gallery section.</p>
-        <p>Experiment with the settings, and don't be afraid to use more than one Hero Image section per page.</p>"
-        info_image_gallery_body: "<p>The Image Gallery section can be configured in several ways. For example, each image can link to a product or taxon. If you do not provide a link, you can display three images. Additionally, you can also use labels to add text to your images.</p>
-        <p>There are two layout configurations for the Image Gallery section, with the taller image used on the left or the right. You can also set this section to fit the edges of the screen or the central container to match your website's style.</p>"
-        info_product_carousel_body: "<p>Product Carousel is a simple section to use. Search for the taxon you wish to display, save the changes, and the products in your chosen taxon will be displayed on your page.</p>"
-        info_featured_article_body: "<p>The Feature Article section allows you to add rich text to your page with a set title subtitle and linking button.</p>
-        <p>This section can be set to use full screen or container and also use gutters.</p>"
-        info_side_by_side_images_body: "<p>The Side-by-Side Images section can be configured in several ways, you have the option of using them as plane images, images with text, and either of those options can be clickable links if a link is set.</p>
-        <p><b>Tip:</b> You can blow these images out to the edge of the screen and remove the gutters to create a completely different look.</p>"
-        info_rich_text_content_body: "<p>The Rich Text Content section is simply a section that offers nothing more than an area of rich text editor content to be displayed on your page.</p>"
-        brand_bar:
-          uses_menu: This section uses your Spree Menu named <b>%{menu}</b> to manage the images and links,
-          vist_menu_to_edit: to edit this menu.
-        full_width_on_small: Full width on small devices
-        button_text: Button Text
-        go_to_fullscreen_section_manager: Go To Fullscreen Section Manager
-        page_type: Page Type
-        gutters: Gutters
-        you_have_no_pages: You have no Pages, click the <b>+ Add New Page</b> button to get started.
-        new_page: New Page
-        toggle_page_visibility: Toggle page visibility
-        meta_title: Meta Title
-        meta_description: Meta Description
-        preview_page: Preview Page
-        full_screen_mode: '<span class="exit">Exit </span>Full Screen Mode'
-        hero:
-          aspect_ratio: Please use an image with the aspect ratio of 12:5 (2400px x 1000px)
-        select_page_type: Select a page type
-        section_type: Section Type
-        subtitle: Subtitle
-        set_gutters: Set Gutters
-        click_button_to_change_page_type: Click the <b>%{button_type}</b> button to load the options for this page type.
-        more_page_settings: '<span class="more">More</span><span class="less">Less</span> Page Settings'
-        seo_settings: SEO Settings
-        no_sections_found_please_add_one: Add your first section to this page by clicking the <b>+ Add New Section</b> button above.
-        click_create_to_load_new_link: 'Click the <b>Create</b> button below to save your new page section, and load the section settings.'
-        click_update_to_load_new_link: 'Click the <b>Update</b> button below to load the new section settings.'
-        settings_for: 'Options For: <b>%{section}</b>'
-        page_sections: '%{page_name} Sections'
-        page_sections_info: 'The area below represents your %{page_type} displayed in %{store}, add sections and drag them into position'
-        visible: Visible
-        side_by_side:
-          left_image: Left Image
-          right_image: Right Image
-          image_info: 'Please use an image with an aspect ratio of 54:35 (1468px x 952px).'
-        image_gallery:
-          display_labels: Display labels
-          image_a: Image A
-          image_b: Image B
-          image_c: Image C
-          layout_style: Layout Style
-          square_image: Please use an image with an aspect ratio of 18:13 (1080px x 780px).
-          tall_image: Please use an image with an aspect ratio of 27:40 (1080px x 1600px).
-      linkable:
-        seach_for_a_page: Search for a page
-      tab:
-        configuration: Configuration
-        content: Content
-        option_types: Option Types
-        orders: Orders
-        overview: Overview
-        pages: Pages
-        products: Products
-        promotions: Promotions
-        promotion_categories: Promotion Categories
-        properties: Properties
-        prototypes: Prototypes
-        reports: Reports
-        navigation: Navigation
-        taxonomies: Taxonomies
-        taxons: Taxons
-        users: Users
-        return_authorizations: Return Authorizations
-        customer_returns: Customer Returns
-      order:
-        changing_store_warning: If you change the store this order belongs to, the order will be reset.
-        once_an_order_is_complete_you_can_not_change_store: 'Sorry, once an order is complete, you can no longer change the store that the order belongs to.'
-        events:
-          approve: approve
-          cancel: cancel
-          resume: resume
-          resend: Resend
-      orders:
-        cart: Cart
-      reports:
-        for: For %{store_name}
-      return_authorization:
-        product: Product
-      user:
-        account: Account
-        addresses: Addresses
-        items: Items
-        items_purchased: Items Purchased
-        order_history: Order History
-        order_num: "Order #"
-        orders: Orders
-        user_information: User Information
-        stores: Stores
-        store_credits: Store Credits
-        no_store_credit: User has no Store Credit available.
-        available_store_credit: User has %{amount} in Store Credit available.
-      navigation:
-        all_menus: All Menus
-        add_new_menu: Add New Menu
-        add_new_item: 'Add New Item'
-        code: Code
-        default_menus_info:
-          title: Default Menus
-          body: "Default menus are menus whose language matches the associated store's default language.<br><br>
-          <h5>Example</h5>If you have a store that uses Spanish as the default language but also offers the options of German and French; your default header menu for this store would be set to use <b>Español (es)</b> for the language and <b>Header</b> as the location.<br><br>
-          <h5>Why Are Default Menus Important?</h5> Default menus are displayed to your visitor if no menu is available in the current language they are browsing. It is recommended that you create a default menu for each menu location within each store.<br><br>
-          <h5>More Information</h5>To learn more about menus, view the official Spree user documentation by <a href='https://guides.spreecommerce.org/user/navigation/building_the_main_menu.html' target='_blank' class='alert-link'>clicking here</a>."
-          allow_this_menu_item_to_contain_nested_menu_items: Allow this Menu Item to contain nested items
-        back_to_all_menus: Back To All Menus
-        click_create_to_load_new_link: 'Click the <b>Create</b> button below to change the link field.'
-        click_update_to_load_new_link: 'Click the <b>Update</b> button below to change the link field.'
-        give_your_menu_a_unique_name: 'Use the unique code to identify your menu: spree-eu-main'
-        link_settings: Link Settings
-        link_to: Link To
-        image_alt_text: Add alt text to your image
-        image_asset: Add a Promotion image or Link icon.
-        move_could_not_be_saved: 'ERROR: This move could not be saved.'
-        managing_by_store_title: 'Managing Menus By Store'
-        managing_by_store: <p>You are managing the menus for <b>%{store}</b>. To manage menus for other stores, change the global store using the drop-down in the main navbar found at the top of the screen.</p>
-        new_menu_item: New Menu Item
-        new_menu: New Menu
-        nested_under: Nested under
-        no_menu_items: '<b>%{menu}</b> has no items. Click the <b>Add New Item</b> button to begin adding links to this menu.'
-        nested_under_info: Quickly nest your Menu Item if you already know where it needs to be.
-        item_type: Item Type
-        image_info: '<b>NOTE:</b> You can attach an image to any menu item, but your image will only be displayed in the main menu when nested inside a container with the code <b>promo</b>.<br><br> For best results use images with a width of 540px and height of 350px.'
-        open_link_in_new_window: Open this link in a new window
-        menu_item_type_container_message: "Containers are menu items that do not link to a destination. If you are building the Spree Main Menu
-        create containers with the code: <b>category</b> or <b>promo</b>, and then nest your links inside these containers build out your menu.
-        <br><br> For an indepth guide to building the main menu see the documenttation page <a href='https://guides.spreecommerce.org/user/navigation/building_the_main_menu.html' target='_blank' class='alert-link'>Building The Main Menu</a>"
-        menus: Menus
-        menu_items: '%{menu_name} Items'
-        public_details: Public Details
-        subtitle: Subtitle
-        url_info: 'The URL field can link to an external website using <b>https://example.com</b>, link to an otherwise unreachable internal path using <b>/policies/privacy</b>,
-        launch an email client using <b>mailto:sales@example.com</b> or used to create a clickable phone number with <b>tel:123456789</b>'
-        seach_for_a_product: Search for a Product
-        seach_for_a_taxon: Search for a Taxon
-        settings: Settings
-        set_a_code: "Adding a code is optional but can be useful if you need to identify this menu item. When building
-        the Spree main menu use the code <b>category</b> or <b>promo</b> to create the containers that organize links and promotions appropriately. To learn more view the documentation by <a href='https://guides.spreecommerce.org/user/navigation/add_menu_items.html' target='_blank' class='alert-link'>clicking here</a>."
-        type: Type
-        used_in: Used In
-        you_have_no_menus: You have no Menus, click the Add New Menu button to create your first Menu.
-        this_link_takes_you_to_your_stores_home_page: This link takes you to your stores home page.
     administration: Administration
     add_new_store: Add New Store
+    adjustments_deleted: Adjustments Deleted
     advertise: Advertise
     agree_to_privacy_policy: Agree to Privacy Policy
     agree_to_terms_of_service: Agree to Terms of Service
@@ -789,7 +625,7 @@ en:
     cannot_set_shipping_method_without_address: Cannot set shipping method until customer details are provided.
     capture: Capture
     capture_events: Capture events
-    card_code: Card Varification Code (CVC)
+    card_code: Card Verification Code (CVC)
     card_number: Card Number
     card_type: Brand
     card_type_is: Card type is
@@ -922,9 +758,12 @@ en:
     default_refund_amount: Default Refund Amount
     default_tax: Default Tax
     default_tax_zone: Default Tax Zone
+    default_wishlist_name: Wishlist
     delete: Delete
     deleted: Deleted
     delete_from_taxon: Delete From Taxon
+    digital:
+      digital_delivery: Digital Delivery
     discontinued_variants_present: Some line items in this order have products that are no longer available.
     delivery: Delivery
     delivery_information: Delivery Information
@@ -985,6 +824,7 @@ en:
       one: 1 error prohibited this record from being saved
       other: ! '%{count} errors prohibited this record from being saved'
     error_user_destroy_with_orders: User associated with orders cannot be destroyed
+    error_user_does_not_have_any_store_credits: 'User does not have any Store Credits available'
     event: Event
     events:
       spree:
@@ -1173,6 +1013,7 @@ en:
     meta_title: Meta Title
     metadata: Metadata
     mutable: Mutable
+    must_have_one_store: The resource must belong to a store.
     min: 'Min'
     minimal_amount: Minimal Amount
     missing_return_authorization: ! 'Missing Return Authorization for %{item_name}.'
@@ -1248,7 +1089,7 @@ en:
     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!
+      oops: Oops!
     no_products_found: No products found
     no_results: No results
     no_rules_added: No rules added
@@ -1622,6 +1463,11 @@ en:
     say_no: 'No'
     say_yes: 'Yes'
     scope: Scope
+    seed:
+      shipping:
+        categories:
+          default: Default
+          digital: Digital
     search: Search
     search_by: 'Search by:'
     search_order_number: Order Number