spree_core 5.2.2 → 5.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 40e658898150457b9405d6d68e58d78c1b31b23518e2ffdb6829d3bfb0d68a90
-  data.tar.gz: e36b7e5d2e39426e2ea9cb4078625f72c36ed58e626959b277174f7f033bdd1f
+  metadata.gz: 71ab78c8a32714ab778383e109efa7639a0ed868b971e05e80c1c31861976b73
+  data.tar.gz: a6bd61a06df7d9bc875e3ec60c247a72cbc0088be0827a88e69dd96adc4e2ce4
 SHA512:
-  metadata.gz: f01a4d3e5245986e4a851dc51fb18103405cf2fab2669a43d504c922a5e7284739a23f6cd17da01276a6ab9a71b4c9589667a4bd7e3373d2c83a9508ea9b87e4
-  data.tar.gz: 1be2f451d4c370d7c72eee740dfce1536308d61ad7f16c114a7db2eb2462401150ca874b56cda455645abccdc65e9bc97e5810ef82dac16a263ed64ea584c7f7
+  metadata.gz: 38858f3d772887de4a876568ed5af0f892a6b51e3c82e9268bd735747dc35825848c7665387373fe5dc951623e4df402fae65d3c9d3cb62c62d21684ddf1aa1f
+  data.tar.gz: fbdbfa593a3718e6c59bfa31a2c1ef7e6061b4c21fea192962bb402e4c18421d044503b832b3b0dbd17eee24616ce42523a5cecb4e0a862ea374f826787f3c22

data/app/assets/images/payment_icons/banktransfer.svg

@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="size-6">
+  <path stroke-linecap="round" stroke-linejoin="round" d="M2.25 18.75a60.07 60.07 0 0 1 15.797 2.101c.727.198 1.453-.342 1.453-1.096V18.75M3.75 4.5v.75A.75.75 0 0 1 3 6h-.75m0 0v-.375c0-.621.504-1.125 1.125-1.125H20.25M2.25 6v9m18-10.5v.75c0 .414.336.75.75.75h.75m-1.5-1.5h.375c.621 0 1.125.504 1.125 1.125v9.75c0 .621-.504 1.125-1.125 1.125h-.375m1.5-1.5H21a.75.75 0 0 0-.75.75v.75m0 0H3.75m0 0h-.375a1.125 1.125 0 0 1-1.125-1.125V15m1.5 1.5v-.75A.75.75 0 0 0 3 15h-.75M15 10.5a3 3 0 1 1-6 0 3 3 0 0 1 6 0Zm3 0h.008v.008H18V10.5Zm-12 0h.008v.008H6V10.5Z" />
+</svg>

data/app/assets/images/payment_icons/sepadebit.svg

@@ -0,0 +1,22 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.0" id="katman_1" x="0px" y="0px" style="enable-background:new 0 0 1190.55 841.89;" xml:space="preserve" viewBox="238.65 160 712.7 521">
+<style type="text/css">
+	.st0{fill:#26367D;}
+	.st1{clip-path:url(#SVGID_00000165933728503162618370000013584018841918814628_);}
+	.st2{fill:#FFFFFF;}
+	.st3{fill:#FBBA2C;}
+</style>
+<path class="st0" d="M302,160h586c34.99,0,63.35,28.36,63.35,63.35v394.3c0,34.99-28.36,63.35-63.35,63.35H302  c-34.99,0-63.35-28.36-63.35-63.35v-394.3C238.65,188.36,267.01,160,302,160z"/>
+<g>
+	<defs>
+		<rect id="SVGID_1_" x="341.04" y="162.96" width="507.9" height="506.81"/>
+	</defs>
+	<clipPath id="SVGID_00000137126528663880082090000017192719521453020821_">
+		<use xlink:href="#SVGID_1_" style="overflow:visible;"/>
+	</clipPath>
+	<g style="clip-path:url(#SVGID_00000137126528663880082090000017192719521453020821_);">
+		<path class="st0" d="M367.09,226.31h455.81c14.38,0,26.04,13.62,26.04,30.41v319.29c0,16.79-11.66,30.41-26.04,30.41H367.09    c-14.38,0-26.05-13.62-26.05-30.41V256.72C341.04,239.93,352.71,226.31,367.09,226.31z"/>
+		<path class="st2" d="M404.53,381.92c0,3.22,0,5.34,1.06,8.55c0,1.09,1.05,2.12,1.05,3.22c2.06,13.91,8.3,20.27,21.76,21.38    c9.3,1.08,19.64,2.12,29,3.22c5.18,0,8.3,3.22,8.3,9.58c0,6.38-2.06,10.69-8.3,10.69h-18.64c-6.24,0-8.3-3.22-9.3-12.81h-24.82    v9.66c0,1.08,1.06,3.22,1.06,4.24c1.05,9.6,7.24,16.03,16.58,18.15c6.22,1.09,12.4,1.09,18.64,2.12h18.64    c6.24-1.09,11.4-2.12,17.58-4.24c7.24-2.12,12.42-7.48,13.46-16.03c1.06-7.48,1.06-16.03,1.06-23.5    c-1.05-8.55-5.16-14.94-13.46-17.1l-18.64-3.23c-6.22-1.09-12.42-1.09-18.64-1.09c-7.24,0-9.3-3.22-9.3-9.58    c0-7.48,3.12-9.6,9.3-10.69h10.34c9.3,0,11.4,1.11,12.42,10.69v1.09h24.82v-6.43c0-13.91-6.22-22.47-20.7-24.6    c-14.46-2.12-28.98-2.12-43.46,1.09c-11.4,2.12-16.58,7.48-18.64,20.27C405.55,378.69,404.53,379.8,404.53,381.92z M631.19,458.83    v-27.8h35.18c13.46,0,22.76-8.55,24.82-21.38c1.06-8.55,2.06-17.1,1.06-25.61c-1.06-19.24-10.34-28.82-28.98-29.93    c-17.58-1.09-35.18-1.09-52.82-1.09c-4.12,0-5.18,1.11-5.18,5.35v101.5C613.61,459.92,622.91,459.92,631.19,458.83z     M631.19,407.53V377.6c0,0,2.06-2.12,3.12-2.12h18.64c7.24,1.11,10.36,4.32,10.36,11.78v10.69c0,6.43-2.06,9.58-8.3,9.58H631.19z     M708.83,459.92c1.06-5.34,2.06-11.77,4.18-17.1c0-1.11,2.06-2.14,3.12-2.14h33.1c1.06,0,2.06,2.12,3.12,3.22    c2.06,5.35,3.12,10.69,5.18,16.03h27.94c-1.06-2.12-2.06-5.34-3.12-7.46l-27.94-96.23c0-1.09-2.06-3.22-3.12-3.22h-39.34    c-4.18,12.88-7.24,25.67-11.4,38.49c-6.24,22.41-13.46,45.9-19.64,68.37C680.9,459.87,708.83,459.92,708.83,459.92z     M747.12,421.43h-26.94c4.12-15,8.3-31.01,12.42-45.96h1.05c4.18,15,9.34,29.93,13.46,45.96H747.12z"/>
+		<path class="st3" d="M575.35,441.71c-16.6,0-29-7.46-34.18-19.24h37.28l4.12-11.77h-45.58v-8.55l46.59,2.12l5.16-13.86h-49.68    c5.16-14.94,18.64-22.46,36.22-22.46c7.44-0.05,14.81,1.44,21.76,4.26l4.12-14.94c-4.12-2.14-13.46-4.26-26.92-4.26    c-27.95,0-49.71,13.91-56.94,38.49h-12.35l-5.18,11.78h15.52v9.53h-9.3l-6.22,11.78h17.58c6.24,21.37,25.88,34.18,53.82,34.18    c13.46,0,23.82-2.12,27.94-4.26l-3.12-14.94C591.93,440.69,583.63,441.71,575.35,441.71z"/>
+	</g>
+</g>
+</svg>

data/app/models/spree/line_item.rb

@@ -163,16 +163,22 @@ module Spree
         # Skip cancelled shipments
         return BigDecimal('0') if shipment.canceled?
 
-        # Get all inventory units in this shipment for this line item
-        line_item_units = shipment.inventory_units.where(line_item_id: id).count
+        # Skip shipments with no cost/zero cost
+        return BigDecimal('0') if shipment.cost.zero?
 
         # Get total inventory units in this shipment
-        total_units = shipment.inventory_units.count
+        total_units = shipment.inventory_units
+
+        # Calculate proportional shipping cost
+        return BigDecimal('0') if total_units.empty?
+
+        # Get all inventory units in this shipment for this line item
+        line_item_units = shipment.inventory_units.find_all { |unit| unit.line_item_id == id }.count
 
         # Calculate proportional shipping cost
-        return BigDecimal('0') if total_units.zero? || line_item_units.zero? || shipment.cost.zero?
+        return BigDecimal('0') if line_item_units.zero?
 
-        shipment.cost * (line_item_units.to_d / total_units)
+        shipment.cost * (line_item_units.to_d / total_units.count)
       end
     end
 

data/app/models/spree/product.rb

@@ -204,10 +204,12 @@ module Spree
                          }
 
     scope :by_best_selling, lambda { |order_direction = :desc|
-      left_joins(:orders).
-        select("#{Spree::Product.table_name}.*, COUNT(#{Spree::Order.table_name}.id) AS completed_orders_count, SUM(#{Spree::Order.table_name}.total) AS completed_orders_total").
-        where(Spree::Order.table_name => { id: nil }).
-        or(where.not(Spree::Order.table_name => { completed_at: nil })).
+      left_joins(variants_including_master: { line_items: :order }).
+        select(
+          "#{Spree::Product.table_name}.*",
+          "COUNT(DISTINCT CASE WHEN #{Spree::Order.table_name}.completed_at IS NOT NULL THEN #{Spree::Order.table_name}.id END) AS completed_orders_count",
+          "COALESCE(SUM(CASE WHEN #{Spree::Order.table_name}.completed_at IS NOT NULL THEN (#{Spree::LineItem.table_name}.price * #{Spree::LineItem.table_name}.quantity) END), 0) AS completed_orders_total"
+        ).
         group("#{Spree::Product.table_name}.id").
         order(completed_orders_count: order_direction, completed_orders_total: order_direction)
     }

data/app/models/spree/report.rb

@@ -25,6 +25,10 @@ module Spree
     #
     has_one_attached :attachment, service: Spree.private_storage_service_name
 
+    def self.report_type
+      name.demodulize.underscore
+    end
+
     # Returns a scope of records to be used for generating report lines
     #
     # @return [ActiveRecord::Relation]
@@ -43,7 +47,11 @@ module Spree
     end
 
     def to_partial_path
-      "spree/admin/reports/report"
+      'spree/admin/reports/report'
+    end
+
+    def no_report_data_partial_path
+      'spree/admin/reports/no_report_data'
     end
 
     def human_name

data/app/models/spree/reports/sales_total.rb

@@ -7,7 +7,7 @@ module Spree
             currency: currency,
             completed_at: (date_from.to_time.beginning_of_day)..(date_to.to_time.end_of_day)
           )
-        ).includes(:order, variant: :product)
+        ).includes(:order, shipments: :inventory_units, variant: :product)
 
         scope = scope.where(vendor_id: vendor.id) if defined?(vendor) && vendor.present?
 

data/config/locales/en.yml

@@ -1410,6 +1410,7 @@ en:
       oops: Oops!
     no_products_added: No products added
     no_products_found: No products found
+    no_report_data: No report data
     no_resource_found: No %{resource} found
     no_results: No results
     no_returns_found: No returns found
@@ -1909,6 +1910,7 @@ en:
     select_stock: Select stock
     select_stores: Select Store(s)
     select_user: Select customer
+    select_vendor: Select vendor
     selected_quantity_not_available: selected of %{item} is not available.
     send_consumer_transactional_emails: Send Customer Transactional Emails
     send_copy_of_all_mails_to: Send Copy of All Mails To

data/lib/spree/core/version.rb

@@ -1,5 +1,5 @@
 module Spree
-  VERSION = '5.2.2'.freeze
+  VERSION = '5.2.4'.freeze
 
   def self.version
     VERSION

data/spec/fixtures/files/example.json

@@ -0,0 +1,4 @@
+{
+  "id": 1,
+  "name": "Example"
+}

data/spec/fixtures/files/products_import.csv

@@ -0,0 +1,18 @@
+slug,sku,name,status,vendor_name,brand_name,description,meta_title,meta_description,meta_keywords,tags,labels,price,compare_at_price,currency,width,height,depth,dimensions_unit,weight,weight_unit,available_on,discontinue_on,track_inventory,inventory_count,inventory_backorderable,tax_category,digital,image1_src,image2_src,image3_src,option1_name,option1_value,option2_name,option2_value,option3_name,option3_value,category1,category2,category3,metafield.properties.fit,metafield.properties.manufacturer,metafield.properties.material,metafield.custom.brand,metafield.custom.material
+denim-shirt,"",Denim Shirt,draft,,,Adipisci sapiente velit nihil ullam. Placeat cumque ipsa cupiditate velit magni sapiente mollitia dolorum. Veritatis esse illo eos perferendis. Perspiciatis vel iusto odio eveniet quam officia quidem. Fugiat a ipsum tempore optio accusantium autem in fugit.,,,,"","",0.0,0.0,USD,,,,,0.0,lb,2025-10-09 14:35:53,,true,100,true,Default,false,,,,,,,,,,Categories -> Men -> Shirts,Categories -> Women,Categories -> Sportswear,Lose,Wannabe,90% Cotton 10% Elastan,,
+denim-shirt,DENIM-SHIRT-XS-BLUE,,,,,,,,,,,62.99,0.0,USD,,,,,0.0,lb,2025-10-09 14:35:53,,true,100,true,Clothing,false,,,,Color,Blue,Size,XS,,,,,
+denim-shirt,DENIM-SHIRT-S-BLUE,,,,,,,,,,,62.99,0.0,USD,,,,,0.0,lb,2025-10-09 14:35:53,,true,100,true,Clothing,false,,,,Color,Blue,Size,S,,,,,
+denim-shirt,DENIM-SHIRT-M-BLUE,,,,,,,,,,,62.99,0.0,USD,,,,,0.0,lb,2025-10-09 14:35:53,,true,100,true,Clothing,false,,,,Color,Blue,Size,M,,,,,
+denim-shirt,DENIM-SHIRT-L-BLUE,,,,,,,,,,,62.99,0.0,USD,,,,,0.0,lb,2025-10-09 14:35:53,,true,100,true,Clothing,false,,,,Color,Blue,Size,L,,,,,
+denim-shirt,DENIM-SHIRT-XL-BLUE,,,,,,,,,,,62.99,0.0,USD,,,,,0.0,lb,2025-10-09 14:35:53,,true,100,true,Clothing,false,,,,Color,Blue,Size,XL,,,,,
+denim-shirt,DENIM-SHIRT-XS-LIGHT-BLUE,,,,,,,,,,,62.99,0.0,USD,,,,,0.0,lb,2025-10-09 14:35:53,,true,100,true,Clothing,false,,,,Color,Light Blue,Size,XS,,,,,
+denim-shirt,DENIM-SHIRT-S-LIGHT-BLUE,,,,,,,,,,,62.99,0.0,USD,,,,,0.0,lb,2025-10-09 14:35:53,,true,100,true,Clothing,false,,,,Color,Light Blue,Size,S,,,,,
+denim-shirt,DENIM-SHIRT-M-LIGHT-BLUE,,,,,,,,,,,62.99,0.0,USD,,,,,0.0,lb,2025-10-09 14:35:53,,true,100,true,Clothing,false,,,,Color,Light Blue,Size,M,,,,,
+denim-shirt,DENIM-SHIRT-L-LIGHT-BLUE,,,,,,,,,,,62.99,0.0,USD,,,,,0.0,lb,2025-10-09 14:35:53,,true,100,true,Clothing,false,,,,Color,Light Blue,Size,L,,,,,
+denim-shirt,DENIM-SHIRT-XL-LIGHT-BLUE,,,,,,,,,,,62.99,0.0,USD,,,,,0.0,lb,2025-10-09 14:35:53,,true,100,true,Clothing,false,,,,Color,Light Blue,Size,XL,,,,,
+checked-shirt,"",Checked Shirt,draft,,,Et ipsam repudiandae itaque tenetur laborum. Cupiditate nulla blanditiis quia tenetur doloremque possimus explicabo asperiores. Facere adipisci veniam aut nemo magnam.,,,,"","",0.0,0.0,USD,,,,,0.0,lb,2025-10-09 14:35:54,,true,100,true,Default,false,,,,,,,,,,Categories -> Men -> Shirts,Categories -> Women,Categories -> Sportswear,Lose,Wannabe,10% Cotton 90% Elastan,,
+checked-shirt,CHECKED-SHIRT-XS-RED,,,,,,,,,,,22.99,0.0,USD,,,,,0.0,lb,2025-10-09 14:35:54,,true,100,true,Clothing,false,,,,Color,Red,Size,XS,,,,,
+checked-shirt,CHECKED-SHIRT-S-RED,,,,,,,,,,,22.99,0.0,USD,,,,,0.0,lb,2025-10-09 14:35:54,,true,100,true,Clothing,false,,,,Color,Red,Size,S,,,,,
+checked-shirt,CHECKED-SHIRT-M-RED,,,,,,,,,,,22.99,0.0,USD,,,,,0.0,lb,2025-10-09 14:35:54,,true,100,true,Clothing,false,,,,Color,Red,Size,M,,,,,
+checked-shirt,CHECKED-SHIRT-L-RED,,,,,,,,,,,22.99,0.0,USD,,,,,0.0,lb,2025-10-09 14:35:54,,true,100,true,Clothing,false,,,,Color,Red,Size,L,,,,,
+checked-shirt,CHECKED-SHIRT-XL-RED,,,,,,,,,,,22.99,0.0,USD,,,,,0.0,lb,2025-10-09 14:35:54,,true,100,true,Clothing,false,,,,Color,Red,Size,XL,,,,,

data/spec/fixtures/text-file.txt

@@ -0,0 +1 @@
+Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. It has survived not only five centuries, but also the leap into electronic typesetting, remaining essentially unchanged. It was popularised in the 1960s with the release of Letraset sheets containing Lorem Ipsum passages, and more recently with desktop publishing software like Aldus PageMaker including versions of Lorem Ipsum.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spree_core
 version: !ruby/object:Gem::Version
-  version: 5.2.2
+  version: 5.2.4
 platform: ruby
 authors:
 - Sean Schofield
@@ -273,6 +273,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
+- !ruby/object:Gem::Dependency
+  name: ostruct
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: paranoia
   requirement: !ruby/object:Gem::Requirement
@@ -600,6 +614,7 @@ files:
 - app/assets/images/payment_icons/bankmuamalat.svg
 - app/assets/images/payment_icons/bankofamerica.svg
 - app/assets/images/payment_icons/bankrakyat.svg
+- app/assets/images/payment_icons/banktransfer.svg
 - app/assets/images/payment_icons/base.svg
 - app/assets/images/payment_icons/becs.svg
 - app/assets/images/payment_icons/benefit.svg
@@ -742,6 +757,7 @@ files:
 - app/assets/images/payment_icons/seabankid.svg
 - app/assets/images/payment_icons/seabankph.svg
 - app/assets/images/payment_icons/sepa_bank_transfer.svg
+- app/assets/images/payment_icons/sepadebit.svg
 - app/assets/images/payment_icons/sepadirectdebit.svg
 - app/assets/images/payment_icons/seveneleven.svg
 - app/assets/images/payment_icons/shib.svg
@@ -1667,6 +1683,15 @@ files:
 - lib/tasks/core.rake
 - lib/tasks/dependencies.rake
 - lib/tasks/exchanges.rake
+- spec/fixtures/favicon.ico
+- spec/fixtures/files/example.json
+- spec/fixtures/files/icon_256x256.gif
+- spec/fixtures/files/icon_256x256.png
+- spec/fixtures/files/icon_512x512.png
+- spec/fixtures/files/img_256x128.png
+- spec/fixtures/files/products_import.csv
+- spec/fixtures/text-file.txt
+- spec/fixtures/thinking-cat.jpg
 - vendor/javascript/@rails--request.js.js
 - vendor/javascript/@stimulus-components--auto-submit.js
 - vendor/javascript/stimulus-reveal-controller.js
@@ -1678,9 +1703,9 @@ licenses:
 - BSD-3-Clause
 metadata:
   bug_tracker_uri: https://github.com/spree/spree/issues
-  changelog_uri: https://github.com/spree/spree/releases/tag/v5.2.2
+  changelog_uri: https://github.com/spree/spree/releases/tag/v5.2.4
   documentation_uri: https://docs.spreecommerce.org/
-  source_code_uri: https://github.com/spree/spree/tree/v5.2.2
+  source_code_uri: https://github.com/spree/spree/tree/v5.2.4
 rdoc_options: []
 require_paths:
 - lib
@@ -1695,7 +1720,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.8.23
 requirements: []
-rubygems_version: 3.6.9
+rubygems_version: 4.0.2
 specification_version: 4
 summary: The bare bones necessary for Spree
 test_files: []