spree_frontend 4.5.0 → 4.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1402fb31c7f3b252aa0143299ea5a3d7fbacda30d8d28fb535c26fef9e06bbf4
-  data.tar.gz: 6ae0c987bc34ff834db6b02c2133277412175aba67f5586f9d938813677a3150
+  metadata.gz: 66ee07c39f3973037fba8e3d5c16f5de80d7cf7152051058b7138ea98b1e0160
+  data.tar.gz: 8413f7984b0dca8fbc785c36d958bf409d7d635dadf997861ed3db8c2f9949c2
 SHA512:
-  metadata.gz: 899e115454881c1e7c759cfb95ed0e9990d7bbe519c0b114dbf506426864f296f557b5ecebe3196c42b6f59ce0d33a66038f8eea8bf6e37013b35fac2c2871fc
-  data.tar.gz: a51ca9229e1f1130ab4c6d951f9c415410f5c9980d65937a417131eb99164b09dde80045bd5b8c086efa02842572318c60aaaff2ffd244d23234f4b0f99758fd
+  metadata.gz: 4276034e9e0892d040c79e0ddbb31753c926d0e1d2d7a7f43a378d23224e2418ec41480b95be79ac84bce9da899b2f6951a7dabbdfdf367b430464084230363c
+  data.tar.gz: 67a583cbbf0c984f0b297b4a258a3391bcef391a54683fa5b7c4bbaaeab5897b37a837e655cba233cfa4835315b908402e5e18fcb6b3371e19bdcd39204f20a3

data/.circleci/config.yml

@@ -7,66 +7,27 @@ defaults: &defaults
     BUNDLE_JOBS: 4
     BUNDLE_RETRY: 3
     BUNDLE_PATH: ~/spree/vendor/bundle
-    RAILS_VERSION: '~> 7.0'
+    RAILS_VERSION: '~> 7.1.0'
   working_directory: ~/spree
   docker:
-    - image: &ruby_2_7_image circleci/ruby:2.7-node-browsers
+    - image: &ruby_3_2_image circleci/ruby:3.0-node-browsers
     - image: &redis_image circleci/redis:6.2-alpine
 
-defaults_3_0: &defaults_3_0
-  <<: *defaults
-  docker:
-    - image: &ruby_3_0_image circleci/ruby:3.0-node-browsers
-    - image: *redis_image
-
-run_tests_2_7: &run_tests_2_7
+run_tests_3_2: &run_tests_3_2
   <<: *defaults
   parallelism: 8
   steps:
     - checkout
     - restore_cache:
         keys:
-          - spree-storefront-old-bundle-v10-ruby-2-7-{{ .Branch }}
-          - spree-storefront-old-bundle-v10-ruby-2-7
-    - run:
-        name: Install libvips
-        command: sudo apt-get install libvips
-    - run:
-          name: Set bundle path
-          command: bundle config --local path vendor/bundle
+          - spree-storefront-old-bundle-v10-ruby-3-2-{{ .Branch }}
+          - spree-storefront-old-bundle-v10-ruby-3-2
     - run:
-          name: Ensure bundle Install
-          command: |
-            bundle check || bundle install
-    - run:
-        name: Create test app
-        command: |
-          bundle exec rake test_app
-    - run:
-          name: Run Rspec
-          command: |
-            TESTFILES=$(circleci tests glob "spec/**/*_spec.rb" | circleci tests split --split-by=timings)
-            bundle exec rspec --format documentation \
-                              --format RspecJunitFormatter \
-                              -o ~/rspec/rspec.xml \
-                              -- ${TESTFILES}
-    - store_test_results:
-          path: ~/rspec
-    - store_artifacts:
-          path: tmp/capybara
-
-run_tests_3_0: &run_tests_3_0
-  <<: *defaults_3_0
-  parallelism: 8
-  steps:
-    - checkout
-    - restore_cache:
-        keys:
-          - spree-storefront-old-bundle-v10-ruby-3-0-{{ .Branch }}
-          - spree-storefront-old-bundle-v10-ruby-3-0
+        name: Add keyserver
+        command: sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 4EB27DB2A3B88B8B
     - run:
         name: Install libvips
-        command: sudo apt-get install libvips
+        command: sudo apt-get update && sudo apt-get install libvips
     - run:
           name: Set bundle path
           command: bundle config --local path vendor/bundle
@@ -92,40 +53,20 @@ run_tests_3_0: &run_tests_3_0
           path: tmp/capybara
 
 jobs:
-  bundle_ruby_2_7:
+  bundle_ruby_3_2:
     <<: *defaults
     steps:
       - checkout
       - restore_cache:
           keys:
-            - spree-storefront-old-bundle-v10-ruby-2-7-{{ .Branch }}
-            - spree-storefront-old-bundle-v10-ruby-2-7
+            - spree-storefront-old-bundle-v10-ruby-3-2-{{ .Branch }}
+            - spree-storefront-old-bundle-v10-ruby-3-2
       - run:
-          name: Install libvips
-          command: sudo apt-get install libvips
-      - run:
-          name: Set bundle path
-          command: bundle config --local path vendor/bundle
-      - run:
-          name: Bundle Install
-          command: |
-            bundle check || bundle install
-      - save_cache:
-          paths:
-            - vendor/bundle
-          key: spree-storefront-old-bundle-v10-ruby-2-7-{{ checksum "Gemfile.lock" }}
-
-  bundle_ruby_3_0:
-    <<: *defaults_3_0
-    steps:
-      - checkout
-      - restore_cache:
-          keys:
-            - spree-storefront-old-bundle-v10-ruby-3-0-{{ .Branch }}
-            - spree-storefront-old-bundle-v10-ruby-3-0
+          name: Add keyserver
+          command: sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 4EB27DB2A3B88B8B
       - run:
           name: Install libvips
-          command: sudo apt-get install libvips
+          command: sudo apt-get update && sudo apt-get install libvips
       - run:
           name: Set bundle path
           command: bundle config --local path vendor/bundle
@@ -136,33 +77,24 @@ jobs:
       - save_cache:
           paths:
             - vendor/bundle
-          key: spree-storefront-old-bundle-v10-ruby-3-0-{{ checksum "Gemfile.lock" }}
+          key: spree-storefront-old-bundle-v10-ruby-3-2-{{ checksum "Gemfile.lock" }}
 
-  tests_ruby_2_7_rails_7_0_postgres:
-    <<: *run_tests_2_7
+  tests_ruby_3_2_rails_7_1_postgres:
+    <<: *run_tests_3_2
     environment: &postgres_environment
       <<: *environment
       DB: postgres
       DB_HOST: localhost
       DB_USERNAME: postgres
     docker:
-      - image: *ruby_2_7_image
-      - image: *redis_image
+      - image: *ruby_3_2_image
       - image: &postgres_image circleci/postgres:12-alpine
         environment:
           POSTGRES_USER: postgres
-
-  tests_ruby_3_0_rails_7_0_postgres:
-    <<: *run_tests_3_0
-    environment:
-      <<: *postgres_environment
-    docker:
-      - image: *ruby_3_0_image
-      - image: *postgres_image
       - image: *redis_image
 
-  tests_ruby_2_7_rails_7_0_mysql:
-    <<: *run_tests_2_7
+  tests_ruby_3_2_rails_7_1_mysql:
+    <<: *run_tests_3_2
     environment: &mysql_environment
       <<: *environment
       DB: mysql
@@ -171,7 +103,7 @@ jobs:
       COVERAGE: true
       COVERAGE_DIR: /tmp/workspace/simplecov
     docker:
-      - image: *ruby_2_7_image
+      - image: *ruby_3_2_image
       - image: *redis_image
       - image: &mysql_image circleci/mysql:8-ram
 
@@ -179,14 +111,10 @@ workflows:
   version: 2
   main:
     jobs:
-      - bundle_ruby_2_7
-      - bundle_ruby_3_0
-      - tests_ruby_3_0_rails_7_0_postgres:
-          requires:
-            - bundle_ruby_3_0
-      - tests_ruby_2_7_rails_7_0_postgres:
+      - bundle_ruby_3_2
+      - tests_ruby_3_2_rails_7_1_postgres:
           requires:
-            - bundle_ruby_2_7
-      - tests_ruby_2_7_rails_7_0_mysql:
+            - bundle_ruby_3_2
+      - tests_ruby_3_2_rails_7_1_mysql:
           requires:
-            - bundle_ruby_2_7
+            - bundle_ruby_3_2

data/.codeclimate.yml

@@ -15,8 +15,8 @@ plugins:
         enabled: false
     config:
       file: .rubocop.yml
-    channel: "rubocop-0-80" # need to keep this value the same as rubocop version
-                            # https://docs.codeclimate.com/v1.0/docs/rubocop#section-using-rubocop-s-newer-versions
+    channel: "rubocop-1-50-3" # need to keep this value the same as rubocop version
+                              # https://docs.codeclimate.com/v1.0/docs/rubocop#section-using-rubocop-s-newer-versions
   eslint:
     enabled: true
     config:

data/.rubocop.yml

@@ -1,7 +1,7 @@
 require: rubocop-rspec
 
 AllCops:
-  TargetRubyVersion: 2.5
+  TargetRubyVersion: 3.0
   Exclude:
     - '**/sandbox/**/*'
     - '**/db/migrate/*'

data/Gemfile

@@ -6,7 +6,7 @@ gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw]
   actionmailer actionpack actionview activejob activemodel activerecord
   activestorage activesupport railties
 ].each do |rails_gem|
-  gem rails_gem, ENV.fetch('RAILS_VERSION', '~> 7.0.0'), require: false
+  gem rails_gem, ENV.fetch('RAILS_VERSION', '~> 7.1.0'), require: false
 end
 
 platforms :jruby do
@@ -22,21 +22,21 @@ platforms :ruby do
 end
 
 group :test do
-  gem 'capybara', '~> 3.24'
-  gem 'capybara-screenshot', '~> 1.0'
+  gem 'capybara'
+  gem 'capybara-screenshot'
   gem 'capybara-select-2'
   gem 'database_cleaner', '~> 2.0'
   gem 'email_spec'
   gem 'factory_bot_rails', '~> 6.0'
   gem 'multi_json'
-  gem 'rspec-activemodel-mocks', '~> 1.0'
-  gem 'rspec-rails', '~> 5.0'
+  gem 'rspec-activemodel-mocks'
+  gem 'rspec-rails'
   gem 'rspec-retry'
   gem 'rspec_junit_formatter'
   gem 'rswag-specs'
   gem 'jsonapi-rspec'
   gem 'simplecov', '0.17.1'
-  gem 'webmock', '~> 3.7'
+  gem 'webmock'
   gem 'timecop'
   gem 'rails-controller-testing'
 end
@@ -48,9 +48,8 @@ group :test, :development do
   gem 'rubocop', '~> 1.22.3', require: false # bumped
   gem 'rubocop-rspec', require: false
   gem 'pry-byebug'
-  gem 'webdrivers', '~> 4.1'
-  # Puma 6.0 causes issues in specs due to conflict with capybara version
-  gem 'puma', '< 6.0'
+  gem 'webdrivers'
+  gem 'puma'
   gem 'ffaker'
 end
 

data/README.md

@@ -42,6 +42,7 @@ If you notice that the 'Add to Cart' button is disabled on product pages, try th
   bin/rails turbo:install
   bin/rails g spree:frontend:install
   yarn build
+  rake assets:clean assets:precompile
   ```
 
 This issue may come up if you switch the source of your `spree_frontend` in your Gemfile, e.g. from github to a local path, etc.

data/app/assets/images/logo.svg

@@ -1 +1,10 @@
-<svg height="52" viewBox="0 0 127 52" width="127" xmlns="http://www.w3.org/2000/svg"><g fill="#232323"><path d="m14.2753364 39.6363969c0 1.4152974-1.1470469 2.5623443-2.5623445 2.5623443-1.4149839 0-2.56203066-1.1470469-2.56203066-2.5623443 0-1.4152977 1.14704676-2.5623446 2.56203066-2.5623446 1.4152976 0 2.5623445 1.1470469 2.5623445 2.5623446"/><path d="m25.047254 39.6363969c0 1.4152974-1.1473605 2.5623443-2.5623444 2.5623443s-2.5620307-1.1470469-2.5620307-2.5623443c0-1.4152977 1.1470468-2.5623446 2.5620307-2.5623446s2.5623444 1.1470469 2.5623444 2.5623446"/><path d="m23.4262975 34.5120218h-12.6542228c-1.01621574 0-1.93203347-.6124277-2.31982063-1.5517763l-3.33321258-8.0698005h-2.60909224c-1.38611948 0-2.50994925-1.1238298-2.50994925-2.5099492 0-1.3861195 1.12382977-2.5099493 2.50994925-2.5099493h4.28793453c1.0162157 0 1.93203341.6127414 2.31982057 1.5517761l3.33321265 8.0698007h9.3131666l3.4298458-8.0911352c.5412077-1.276623 2.0142341-1.8714809 3.2908569-1.3315281 1.2759956.5412078 1.8721085 2.0142343 1.3312145 3.2905435l-4.0786675 9.6215765c-.3934346.9277402-1.3032912 1.5304418-2.3110358 1.5304418"/><path d="m26.2302245 11.5434448c-.9603692-1.0002148-2.5491671-1.0322166-3.5490681-.0718473l-3.124573 3.0000168v-11.96147681c0-1.38643322-1.1235161-2.50994924-2.5099493-2.50994924-1.3861195 0-2.5099492 1.12351602-2.5099492 2.50994924v11.90280681l-3.0069192-2.9291108c-.9929987-.9669579-2.5821103-.9465646-3.54938199.0467478-.96727169.9929987-.94656461 2.5821103.04643405 3.549382l7.26849924 7.0796255c.0332568.0323156.0690236.0608663.1035354.0909857.0181972.0160009.0357668.0326294.0545914.0483165.0853383.0702786.1741278.1342823.2660546.1916974.0128635.0078436.0266683.0150597.0398455.023217.0903582.053964.1832263.1019667.2782906.1436946.0087848.003765.0163147.0090986.0250995.0128635.0059611.00251.0119223.0043924.0175697.0065886.0571013.0238446.1148301.0442379.1731864.0633763.0213346.0072161.0423555.0156872.06369.0222758.0571013.0169421.1151439.0307468.1728728.0439241.023217.0053336.0461203.012236.0693373.0166284.0580426.0116085.1163989.0191384.1747552.0263545.0232171.0028237.0458066.0078436.0690236.009726.078436.0078436.1568719.0116085.2353078.0116085.0025099 0 .0050199.0006275.0078436.0006275h.0003137c.0065886 0 .013491-.0009412.0200796-.0009412.073416-.0006275.146832-.0037649.2196206-.0106673.0432966-.0040787.0862795-.012236.1289486-.0185109.0360805-.0053336.072161-.0090985.1079278-.0160009.0511402-.0097261.101653-.0235308.1521657-.0363943.0266682-.0072161.0539639-.012236.0803184-.0200796.0520814-.0153734.1025942-.034198.1537344-.0530226.024472-.0087849.0495715-.0163147.0740435-.0263545.0486302-.0194521.0960055-.0423554.1436945-.0652587.0260408-.012236.0523952-.0235308.0778085-.036708.0432966-.0225895.0853383-.0480028.1276936-.073416.0288645-.0172559.0583564-.0335706.0865933-.0520815.0370218-.0241582.0727885-.0511402.108869-.0774946.0320019-.0235308.0643175-.0467479.0953781-.0718473.0313744-.0254133.0614938-.0530227.0919269-.0800047.023217-.020707.0473753-.0392179.0699649-.0608662l7.3729758-7.0793119c.999901-.9603693 1.031903-2.5491672.0718472-3.5490682"/><path d="m17.4343584 51.7764879c-2.5146555 0-5.1375524-.9468783-7.95716663-2.8403213-1.15081172-.7727506-1.45733926-2.3320566-.68458864-3.4828683.7727506-1.150498 2.33205657-1.4570256 3.48318207-.6845886 4.3949211 2.9513865 6.8782021 2.2404435 9.4612536.1374197 1.0751996-.8750312 2.6561538-.7134532 3.5311848.3617464.8750312 1.0751996.7131395 2.6561539-.3620601 3.5311849-2.4384157 1.9850561-4.8981659 2.9774272-7.4718051 2.9774272"/><path d="m48.1055811 42.6457631c-2.3471162 0-5.1039816-1.0799056-6.2962075-2.8685582-.2604073-.3353919-.3724136-.7074919-.3724136-1.1175548 0-1.0055486.9315048-1.8626961 1.9370531-1.8626961.5217557 0 1.0061761.2604073 1.4902825.8198122.7451412.9308773 1.8256743 1.3782757 3.2412855 1.3782757 2.4961446 0 3.9490916-1.4529467 3.9490916-2.9805647 0-1.6389968-1.6393106-2.7568654-3.6880567-3.5020067-2.0490599-.7448274-4.2474617-1.4529467-5.7000949-3.2783073-.7078054-.931505-1.0805331-2.0487461-1.0805331-3.4273358 0-3.8373986 3.2039503-6.0728221 6.780628-6.0728221 2.384138 0 4.9919754 1.3039186 6.2958938 3.2786212.1863638.2980565.2980566.6331347.2980566 1.0428839 0 1.0431977-.8941696 1.8630098-1.9373672 1.8630098-.5587774 0-1.0428838-.2983702-1.4899684-.8941693-.7824768-1.0805332-1.8256744-1.6393107-3.1666148-1.6393107-1.9376809 0-3.0552358 1.0805331-3.0552358 2.4217872 0 1.3785897 1.6393106 2.309781 3.6883705 3.054922 2.0490597.7824767 4.2471479 1.5649535 5.7000946 3.5390284.7078057 1.0061761 1.0802196 2.1980882 1.0802196 3.6136994 0 3.9864271-3.5390286 6.6312859-7.6744838 6.6312859zm14.1467957 5.2685404c0 1.1574004-.8584027 1.866461-1.8661472 1.866461-1.0077447 0-1.8661474-.7090606-1.8661474-1.866461v-20.1555198c0-4.441669 3.5829525-8.0246215 8.0246215-8.0246215 4.4419828 0 8.0249353 3.5829525 8.0249353 8.0246215v6.9054977c0 4.4413552-3.5829525 8.0246215-8.0249353 8.0246215-1.6794698 0-3.0979048-.5226968-4.2923269-1.6047988zm0-13.2500221c0 2.3885304 1.9034827 4.2923269 4.2923269 4.2923269s4.2923269-1.9037965 4.2923269-4.2923269v-6.9054977c0-2.3888443-1.9034827-4.292327-4.2923269-4.292327s-4.2923269 1.9034827-4.2923269 4.292327zm26.6424837-9.6207922c-.4900675 0-.9415448-.1885601-1.3560001-.6027016l-.0752984-.0752985c-.7153357-.5647386-1.5056559-.8659325-2.4472007-.8659325-2.2216187 0-3.577305 1.5439326-3.577305 4.5938346v12.5390788c0 1.1674403-.8659326 1.8827758-1.8827757 1.8827758s-1.8827758-.7153355-1.8827758-1.8827758v-12.5390788c0-4.7067823 2.6734098-8.3593859 7.3428565-8.3593859 1.8068499 0 3.9908195.8282832 5.2338717 2.0710218.3764925.4141417.5647387.828597.5647387 1.3177234 0 1.0168432-.9035817 1.9207387-1.9201112 1.9207387zm19.4309605 5.3081974c0 1.0061761-.856834 1.8626961-1.862696 1.8626961h-10.431663v2.4217873c0 2.23511 2.1610662 4.2841696 4.657211 4.2841696 1.489968 0 2.682194-.4841064 3.613699-1.4156114.409436-.5590912.893856-.8568338 1.489969-.8568338 1.006176 0 1.937681.8568338 1.937681 1.8623823 0 .7454548-.410063 1.2295614-.857148 1.6766461-1.527304 1.6393105-3.6137 2.458809-6.184201 2.458809-4.3588409 0-8.382917-3.5760501-8.382917-8.0095618v-6.8923205c0-4.4331979 3.5769915-8.0098756 8.010189-8.0098756 4.433198 0 8.009876 3.5766777 8.009876 8.0098756zm-3.725392-1.8626961v-.745141c0-2.3844518-1.900346-4.2841697-4.284484-4.2841697-2.3844516 0-4.284483 1.8997179-4.284483 4.2841697v.745141zm22.330924 1.8626961c0 1.0061761-.856834 1.8626961-1.862696 1.8626961h-10.431349v2.4217873c0 2.23511 2.160752 4.2841696 4.656897 4.2841696 1.489969 0 2.682508-.4841064 3.613699-1.4156114.409749-.5590912.893856-.8568338 1.490283-.8568338 1.005862 0 1.937367.8568338 1.937367 1.8623823 0 .7454548-.40975 1.2295614-.857148 1.6766461-1.527304 1.6393105-3.613386 2.458809-6.184201 2.458809-4.358841 0-8.382917-3.5760501-8.382917-8.0095618v-6.8923205c0-4.4331979 3.576991-8.0098756 8.010189-8.0098756 4.433512 0 8.009876 3.5766777 8.009876 8.0098756zm-3.725392-1.8626961v-.745141c0-2.3844518-1.900346-4.2841697-4.284484-4.2841697-2.384451 0-4.284169 1.8997179-4.284169 4.2841697v.745141z"/></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="1199.129" height="300.825" viewBox="0 0 1199.129 300.825">
+  <g transform="translate(-224.344 -239.125)" fill="currentColor">
+    <g transform="translate(224.344 239.125)">
+      <g>
+        <path d="M125.668,240.112h0a72.581,72.581,0,0,1-23.006-3.89,94.124,94.124,0,0,1-18.873-8.857,107.267,107.267,0,0,1-20.2-15.773h0a.038.038,0,0,1-.01-.008L67.7,205.44a.257.257,0,0,0,.031.015,129.888,129.888,0,0,0,18,6.538,159.717,159.717,0,0,0,18.66,4.242,140.957,140.957,0,0,0,22.752,1.911c18.939,0,36.223-4.183,51.365-12.433l4.6,6.144C165.469,230.606,146.145,240.112,125.668,240.112Zm49.205-52.481a15.174,15.174,0,0,1-10.359-3.971,12.848,12.848,0,0,1,0-19.168,15.5,15.5,0,0,1,20.719,0,12.848,12.848,0,0,1,0,19.168A15.167,15.167,0,0,1,174.873,187.631Zm-102.539,0c-8.377,0-15.2-6.081-15.2-13.555s6.818-13.555,15.2-13.555a16.057,16.057,0,0,1,10.74,3.971,12.551,12.551,0,0,1,0,19.168A16.06,16.06,0,0,1,72.334,187.631Zm5.723-45.9a32.085,32.085,0,0,1-10.328-1.7,31.065,31.065,0,0,1-8.91-4.729,29.019,29.019,0,0,1-6.748-7.224,27.241,27.241,0,0,1-3.848-9.182L30.924,18.424H0L.008,0h37.41A12.563,12.563,0,0,1,44.98,2.5a10.945,10.945,0,0,1,4.137,6.373l4.895,24.229H203.217a12.291,12.291,0,0,1,9.2,4,10.438,10.438,0,0,1,2.531,9.111l-14.965,72.605a27.356,27.356,0,0,1-3.859,9.228,28.967,28.967,0,0,1-6.777,7.248,31.211,31.211,0,0,1-8.98,4.738,32.738,32.738,0,0,1-10.459,1.7c-.2,0-.387,0-.588-.005H78.641C78.449,141.736,78.25,141.736,78.057,141.736ZM193.385,52.909h0l-135.6.019,10.869,61.653a6.213,6.213,0,0,0,2.342,3.641,7.124,7.124,0,0,0,4.291,1.419h.131l97.768-.019h.152a6.726,6.726,0,0,0,6.846-5.041L193.389,52.91Z" transform="translate(0 0)" />
+      </g>
+    </g>
+    <path d="M220.518,267.868H188.227V3.852h28.885l3.414,34.871.051.538h3.205l.17-.313a71.884,71.884,0,0,1,12.227-16.555A70.851,70.851,0,0,1,252.49,10.179a80,80,0,0,1,19.9-7.58A99.514,99.514,0,0,1,295.41,0c12.859,0,24.6,2.308,34.889,6.858a69.852,69.852,0,0,1,26.039,19.913c7.152,8.765,12.648,19.555,16.334,32.071,3.758,12.743,5.662,27.323,5.662,43.333,0,16.193-1.9,30.9-5.662,43.722-3.693,12.6-9.189,23.417-16.334,32.165A69.522,69.522,0,0,1,330.3,197.925c-10.266,4.522-22,6.815-34.895,6.815a101.836,101.836,0,0,1-23.617-2.656,79.464,79.464,0,0,1-20.025-7.667,67.849,67.849,0,0,1-27.812-28.62l-.168-.319h-3.27Zm65.65-241.347a76.039,76.039,0,0,0-26.777,4.591A59.7,59.7,0,0,0,238.65,44.06a57.23,57.23,0,0,0-13.391,20.02,68.977,68.977,0,0,0-4.742,25.782v25.018A68.52,68.52,0,0,0,225.26,140.6a56.735,56.735,0,0,0,13.391,19.894A59.585,59.585,0,0,0,259.4,173.3a76.919,76.919,0,0,0,26.77,4.535c17.721,0,32.619-5.164,43.084-14.933,10.484-9.782,16.025-23.727,16.025-40.327V82.163c0-16.625-5.539-30.635-16.018-40.514C318.768,31.752,303.867,26.521,286.168,26.521ZM813.123,207.434c-14.346,0-27.553-2.449-39.25-7.278a81.139,81.139,0,0,1-29.59-20.815,92.683,92.683,0,0,1-18.717-32.885c-4.332-12.969-6.531-27.608-6.531-43.509,0-15.868,2.2-30.426,6.525-43.271a90,90,0,0,1,18.674-32.347A80.172,80.172,0,0,1,773.711,7.041C785.316,2.369,798.449,0,812.74,0a104.883,104.883,0,0,1,36.965,6.245,76.843,76.843,0,0,1,27.906,17.877A78.153,78.153,0,0,1,895.27,52.385a108.659,108.659,0,0,1,6.178,37.477,171.369,171.369,0,0,1-1.086,20.188H752.1l0,12.146a65.8,65.8,0,0,0,4.406,24.36,53.083,53.083,0,0,0,12.516,18.792,55.624,55.624,0,0,0,19.518,12.077,73.161,73.161,0,0,0,25.357,4.259c13.848,0,26.477-3.546,36.518-10.254a49.172,49.172,0,0,0,20.127-27.085h31.914c-4.311,19.228-14.252,34.234-30.393,45.877a92.6,92.6,0,0,1-12.91,7.529,93.781,93.781,0,0,1-14.1,5.375,104.528,104.528,0,0,1-15.326,3.232A124.678,124.678,0,0,1,813.123,207.434ZM812.74,25.75a73.857,73.857,0,0,0-24.521,3.965,56.338,56.338,0,0,0-19.18,11.2A49.878,49.878,0,0,0,756.547,58.26,55.846,55.846,0,0,0,752.1,80.622V86.61H869.535l0-8.3a55.422,55.422,0,0,0-4.117-21.5A47.378,47.378,0,0,0,853.8,40.195a51.919,51.919,0,0,0-17.953-10.673A68.611,68.611,0,0,0,812.74,25.75ZM602.188,207.434c-14.346,0-27.553-2.449-39.25-7.278a81.053,81.053,0,0,1-29.59-20.815,92.683,92.683,0,0,1-18.717-32.885c-4.332-12.969-6.531-27.608-6.531-43.509,0-15.882,2.2-30.44,6.525-43.271A90,90,0,0,1,533.3,27.329,80.2,80.2,0,0,1,562.77,7.041C574.381,2.369,587.514,0,601.8,0A104.883,104.883,0,0,1,638.77,6.245a76.845,76.845,0,0,1,27.9,17.877,78.078,78.078,0,0,1,17.664,28.263,108.613,108.613,0,0,1,6.178,37.477,171.4,171.4,0,0,1-1.084,20.188H541.16l0,12.146a65.8,65.8,0,0,0,4.406,24.36,53,53,0,0,0,12.516,18.792,55.615,55.615,0,0,0,19.52,12.077,73.094,73.094,0,0,0,25.355,4.259c13.848,0,26.477-3.546,36.518-10.254A49.146,49.146,0,0,0,659.6,144.344h31.914c-4.311,19.228-14.252,34.234-30.393,45.877a91.839,91.839,0,0,1-27.012,12.9,104.621,104.621,0,0,1-15.326,3.232A124.678,124.678,0,0,1,602.188,207.434ZM601.8,25.75a73.849,73.849,0,0,0-24.521,3.965,56.338,56.338,0,0,0-19.18,11.2A49.755,49.755,0,0,0,545.611,58.26a55.846,55.846,0,0,0-4.449,22.362V86.61H658.6l0-8.3a55.377,55.377,0,0,0-4.117-21.5,47.378,47.378,0,0,0-11.619-16.612,51.906,51.906,0,0,0-17.953-10.673A68.619,68.619,0,0,0,601.8,25.75ZM81.393,207.434c-24.617,0-45.252-6.1-59.678-17.626A56.742,56.742,0,0,1,5.605,169.613,60.958,60.958,0,0,1,0,143.962H31.914c.158,11.487,4.887,21.176,13.678,28.021s21.18,10.47,35.8,10.47a73.968,73.968,0,0,0,19.047-2.274,42.731,42.731,0,0,0,14.363-6.646,29.5,29.5,0,0,0,9.076-10.736,32.54,32.54,0,0,0,3.146-14.432,30.161,30.161,0,0,0-1.7-10.379,23.257,23.257,0,0,0-5.111-8.218,28.879,28.879,0,0,0-8.469-5.976,49.488,49.488,0,0,0-11.77-3.727l-43.113-8.086a100.8,100.8,0,0,1-23.322-6.953A56.1,56.1,0,0,1,17,93.958,42.633,42.633,0,0,1,7.139,78.8,54.181,54.181,0,0,1,3.854,59.45,57.6,57.6,0,0,1,9.145,34.57,51.835,51.835,0,0,1,24.215,15.9C37.465,5.5,56.438,0,79.08,0A110.546,110.546,0,0,1,111.02,4.34a70.231,70.231,0,0,1,23.936,12.271c13.072,10.551,20.162,25.557,20.5,43.4H123.535c-1-23.5-15.959-35.416-44.455-35.416a70.987,70.987,0,0,0-18.3,2.18A39.769,39.769,0,0,0,47.3,33.035a27.234,27.234,0,0,0-8.334,9.922,29.573,29.573,0,0,0-2.83,13.029,28.154,28.154,0,0,0,3.4,14.106,23.2,23.2,0,0,0,9.619,9.133l.045.019c7.922,3.4,11.479,4.623,19.758,6.2l39.648,7.31A93.816,93.816,0,0,1,131.49,99.57a54.132,54.132,0,0,1,16.3,11.206,43.876,43.876,0,0,1,9.783,15.591,58.259,58.259,0,0,1,3.273,20.075,58.013,58.013,0,0,1-5.57,25.6A53.43,53.43,0,0,1,139.395,191.2C125.43,201.82,105.373,207.434,81.393,207.434Zm357.762-3.852H406.861V32.891a39.827,39.827,0,0,1,1.848-12.722,22.8,22.8,0,0,1,5.525-9.032A23.415,23.415,0,0,1,423.5,5.693a42.561,42.561,0,0,1,13.174-1.841h69.07V30.367H439.158Z" transform="translate(521.02 272.083)" />
+  </g>
+</svg>

data/app/assets/images/noimage/plp.svg

@@ -1,23 +1,16 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg width="100%" height="100%" viewBox="0 0 180 240" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;">
-    <g transform="matrix(0.32046,0,0,0.32046,7.99036,6.23638)">
-        <path d="M193.937,171.926C184.475,171.926 173.361,167.573 168.554,160.362C167.504,159.01 167.053,157.509 167.053,155.856C167.053,151.802 170.808,148.347 174.862,148.347C176.966,148.347 178.919,149.397 180.87,151.652C183.874,155.405 188.23,157.208 193.937,157.208C204.001,157.208 209.858,151.351 209.858,145.192C209.858,138.585 203.249,134.078 194.99,131.074C186.729,128.071 177.866,125.216 172.01,117.857C169.156,114.102 167.654,109.598 167.654,104.04C167.654,88.57 180.57,79.558 194.99,79.558C204.601,79.558 215.115,84.814 220.372,92.775C221.123,93.977 221.573,95.328 221.573,96.98C221.573,101.185 217.968,104.49 213.763,104.49C211.51,104.49 209.558,103.288 207.756,100.886C204.601,96.529 200.396,94.277 194.99,94.277C187.178,94.277 182.673,98.633 182.673,104.04C182.673,109.598 189.282,113.352 197.542,116.356C205.803,119.511 214.665,122.665 220.522,130.624C223.376,134.68 224.877,139.485 224.877,145.192C224.877,161.263 210.61,171.926 193.937,171.926ZM250.97,193.166C250.97,197.832 247.51,200.691 243.447,200.691C239.384,200.691 235.923,197.832 235.923,193.166L235.923,111.909C235.923,94.003 250.368,79.558 268.275,79.558C286.183,79.558 300.627,94.003 300.627,111.909L300.627,139.749C300.627,157.654 286.183,172.1 268.275,172.1C261.504,172.1 255.786,169.993 250.97,165.63L250.97,193.166ZM250.97,139.749C250.97,149.378 258.644,157.053 268.275,157.053C277.905,157.053 285.579,149.378 285.579,139.749L285.579,111.909C285.579,102.279 277.905,94.605 268.275,94.605C258.644,94.605 250.97,102.279 250.97,111.909L250.97,139.749ZM358.379,100.963C356.404,100.963 354.583,100.203 352.913,98.533L352.609,98.229C349.725,95.953 346.539,94.738 342.743,94.738C333.787,94.738 328.321,100.963 328.321,113.258L328.321,163.81C328.321,168.516 324.83,171.4 320.731,171.4C316.631,171.4 313.14,168.516 313.14,163.81L313.14,113.258C313.14,94.283 323.918,79.558 342.743,79.558C350.027,79.558 358.832,82.897 363.843,87.907C365.361,89.576 366.12,91.247 366.12,93.219C366.12,97.319 362.477,100.963 358.379,100.963ZM436.715,122.363C436.715,126.419 433.261,129.872 429.206,129.872L387.15,129.872L387.15,139.636C387.15,148.646 395.863,156.907 405.926,156.907C411.933,156.907 416.739,154.956 420.495,151.2C422.145,148.946 424.098,147.746 426.501,147.746C430.558,147.746 434.313,151.2 434.313,155.254C434.313,158.259 432.66,160.211 430.858,162.013C424.7,168.622 416.289,171.926 405.926,171.926C388.353,171.926 372.13,157.509 372.13,139.636L372.13,111.849C372.13,93.977 386.551,79.557 404.423,79.557C422.296,79.557 436.715,93.977 436.715,111.849L436.715,122.363ZM421.696,114.853L421.696,111.849C421.696,102.236 414.035,94.578 404.423,94.578C394.81,94.578 387.15,102.236 387.15,111.849L387.15,114.853L421.696,114.853ZM511.723,122.363C511.723,126.419 508.269,129.872 504.214,129.872L462.16,129.872L462.16,139.636C462.16,148.646 470.871,156.907 480.934,156.907C486.941,156.907 491.749,154.956 495.503,151.2C497.155,148.946 499.106,147.746 501.511,147.746C505.566,147.746 509.321,151.2 509.321,155.254C509.321,158.259 507.669,160.211 505.866,162.013C499.708,168.622 491.298,171.926 480.934,171.926C463.361,171.926 447.138,157.509 447.138,139.636L447.138,111.849C447.138,93.977 461.559,79.557 479.431,79.557C497.305,79.557 511.723,93.977 511.723,111.849L511.723,122.363ZM496.704,114.853L496.704,111.849C496.704,102.236 489.043,94.578 479.431,94.578C469.819,94.578 462.16,102.236 462.16,111.849L462.16,114.853L496.704,114.853Z" style="fill:rgb(0,102,204);fill-rule:nonzero;"/>
-        <path d="M57.551,159.794C57.551,165.5 52.927,170.124 47.221,170.124C41.516,170.124 36.892,165.5 36.892,159.794C36.892,154.088 41.516,149.464 47.221,149.464C52.927,149.464 57.551,154.088 57.551,159.794" style="fill:rgb(0,102,204);fill-rule:nonzero;"/>
-        <path d="M100.978,159.794C100.978,165.5 96.352,170.124 90.648,170.124C84.943,170.124 80.319,165.5 80.319,159.794C80.319,154.088 84.943,149.464 90.648,149.464C96.352,149.464 100.978,154.088 100.978,159.794" style="fill:rgb(0,102,204);fill-rule:nonzero;"/>
-        <path d="M94.443,139.135L43.428,139.135C39.331,139.135 35.639,136.666 34.075,132.879L20.637,100.346L10.119,100.346C4.531,100.346 0,95.815 0,90.227C0,84.639 4.531,80.108 10.119,80.108L27.406,80.108C31.503,80.108 35.195,82.578 36.758,86.364L50.196,118.897L87.742,118.897L101.569,86.278C103.751,81.131 109.69,78.733 114.836,80.91C119.98,83.092 122.384,89.03 120.203,94.176L103.76,132.965C102.174,136.705 98.506,139.135 94.443,139.135" style="fill:rgb(0,102,204);fill-rule:nonzero;"/>
-        <path d="M105.747,46.537C101.875,42.505 95.47,42.376 91.439,46.248L78.842,58.342L78.842,10.12C78.842,4.53 74.313,0.001 68.723,0.001C63.135,0.001 58.605,4.53 58.605,10.12L58.605,58.106L46.482,46.297C42.479,42.399 36.072,42.481 32.173,46.485C28.273,50.489 28.357,56.895 32.36,60.795L61.663,89.336C61.797,89.467 61.941,89.582 62.08,89.703C62.154,89.768 62.225,89.835 62.3,89.898C62.645,90.181 63.002,90.439 63.373,90.671C63.425,90.702 63.481,90.731 63.534,90.764C63.898,90.982 64.272,91.175 64.656,91.344C64.691,91.359 64.721,91.38 64.757,91.395C64.781,91.406 64.805,91.413 64.828,91.422C65.058,91.518 65.291,91.6 65.526,91.678C65.612,91.707 65.697,91.741 65.783,91.767C66.013,91.836 66.247,91.891 66.48,91.944C66.573,91.966 66.666,91.994 66.759,92.011C66.993,92.058 67.228,92.089 67.464,92.118C67.557,92.129 67.648,92.149 67.742,92.157C68.058,92.189 68.374,92.204 68.691,92.204C68.701,92.204 68.711,92.206 68.722,92.206L68.723,92.206C68.75,92.206 68.778,92.202 68.804,92.202C69.1,92.2 69.396,92.187 69.69,92.159C69.864,92.143 70.038,92.11 70.21,92.085C70.355,92.063 70.501,92.048 70.645,92.02C70.851,91.981 71.055,91.925 71.258,91.874C71.366,91.845 71.476,91.824 71.582,91.793C71.792,91.731 71.996,91.655 72.202,91.579C72.3,91.543 72.402,91.513 72.5,91.473C72.696,91.394 72.887,91.302 73.08,91.21C73.185,91.16 73.291,91.115 73.393,91.062C73.568,90.97 73.737,90.868 73.908,90.766C74.024,90.696 74.143,90.63 74.257,90.556C74.406,90.458 74.551,90.349 74.696,90.243C74.825,90.148 74.955,90.055 75.081,89.954C75.207,89.851 75.329,89.74 75.451,89.631C75.545,89.548 75.642,89.473 75.733,89.386L105.457,60.845C109.488,56.974 109.618,50.568 105.747,46.537" style="fill:rgb(153,204,0);fill-rule:nonzero;"/>
-        <path d="M70.287,208.737C60.149,208.737 49.575,204.919 38.207,197.286C33.568,194.171 32.332,187.884 35.447,183.245C38.563,178.607 44.849,177.371 49.49,180.485C67.208,192.383 77.219,189.517 87.633,181.039C91.967,177.511 98.341,178.163 101.869,182.497C105.396,186.832 104.744,193.206 100.409,196.733C90.579,204.736 80.662,208.737 70.287,208.737" style="fill:rgb(153,204,0);fill-rule:nonzero;"/>
+<svg width="180" height="240" xmlns="http://www.w3.org/2000/svg" version="1.1" xml:space="preserve" clip-rule="evenodd">
+  <g>
+    <g fill="rgb(0,0,0)" opacity="0.5">
+      <path stroke="null"
+            d="m37.38608,79.18345l0,0a8.05821,8.05821 0 0 1 -2.55421,-0.43188a10.45,10.45 0 0 1 -2.09535,-0.98334a11.90918,11.90918 0 0 1 -2.24268,-1.75118l0,0a0.00422,0.00422 0 0 1 -0.00111,-0.00089l0.45753,-0.68213a0.02854,0.02854 0 0 0 0.00344,0.00167a14.42065,14.42065 0 0 0 1.99843,0.72587a17.73238,17.73238 0 0 0 2.0717,0.47096a15.64957,15.64957 0 0 0 2.52601,0.21216c2.10268,0 4.02162,-0.46441 5.70274,-1.38036l0.51071,0.68213c-1.95835,2.08158 -4.10377,3.13697 -6.3772,3.13697l-0.00002,0.00002zm5.46292,-5.82663a1.68467,1.68467 0 0 1 -1.15009,-0.44087a1.42643,1.42643 0 0 1 0,-2.1281a1.72087,1.72087 0 0 1 2.3003,0a1.42643,1.42643 0 0 1 0,2.1281a1.6839,1.6839 0 0 1 -1.15021,0.44087zm-11.38426,0c-0.93005,0 -1.68756,-0.67513 -1.68756,-1.50492s0.75696,-1.50492 1.68756,-1.50492a1.78271,1.78271 0 0 1 1.19239,0.44087a1.39346,1.39346 0 0 1 0,2.1281a1.78304,1.78304 0 0 1 -1.19239,0.44087zm0.63539,-5.09599a3.5622,3.5622 0 0 1 -1.14665,-0.18874a3.44895,3.44895 0 0 1 -0.98922,-0.52503a3.2218,3.2218 0 0 1 -0.74919,-0.80204a3.0244,3.0244 0 0 1 -0.42722,-1.01942l-1.9206,-11.15478l-3.43329,0l0.00089,-2.0455l4.1534,0a1.39479,1.39479 0 0 1 0.83956,0.27756a1.21515,1.21515 0 0 1 0.4593,0.70756l0.54346,2.68999l16.56529,0a1.36459,1.36459 0 0 1 1.02142,0.44409a1.15887,1.15887 0 0 1 0.281,1.01154l-1.66147,8.06088a3.03716,3.03716 0 0 1 -0.42844,1.02453a3.21602,3.21602 0 0 1 -0.75241,0.8047a3.46516,3.46516 0 0 1 -0.99699,0.52603a3.6347,3.6347 0 0 1 -1.1612,0.18874c-0.02221,0 -0.04296,0 -0.06528,-0.00056l-10.06752,0c-0.02132,0.001 -0.04341,0.001 -0.06484,0.001l0,-0.00056l0.00001,0.00001zm12.80414,-9.86134l0,0l-15.05482,0.00211l1.20671,6.84495a0.68979,0.68979 0 0 0 0.26002,0.40424a0.79094,0.79094 0 0 0 0.4764,0.15754l0.01455,0l10.85456,-0.00211l0.01688,0a0.74674,0.74674 0 0 0 0.76007,-0.55967l1.46607,-6.84695l-0.00044,-0.00011z"
+            id="svg_4"/>
+      <path stroke="null"
+            d="m80.85475,85.92415l-3.58506,0l0,-29.31204l3.20692,0l0.37903,3.87151l0.00566,0.05973l0.35583,0l0.01888,-0.03475a7.98083,7.98083 0 0 1 1.35748,-1.838a7.86614,7.86614 0 0 1 1.8109,-1.35604a8.88189,8.88189 0 0 1 2.20937,-0.84156a11.04841,11.04841 0 0 1 2.55577,-0.28855c1.42765,0 2.73118,0.25625 3.87351,0.7614a7.75523,7.75523 0 0 1 2.89094,2.21081c0.79405,0.97312 1.40423,2.17107 1.81346,3.56065c0.41723,1.41478 0.62862,3.0335 0.62862,4.81099c0,1.79781 -0.21094,3.43063 -0.62862,4.85418c-0.41001,1.3989 -1.0202,2.59984 -1.81346,3.57107a7.71859,7.71859 0 0 1 -2.89083,2.20526c-1.13977,0.50205 -2.44252,0.75663 -3.87417,0.75663a11.30621,11.30621 0 0 1 -2.62205,-0.29488a8.82239,8.82239 0 0 1 -2.22325,-0.85122a7.53285,7.53285 0 0 1 -3.08779,-3.1775l-0.01865,-0.03542l-0.36304,0l0.00056,11.36772l-0.00001,0zm7.28871,-26.79524a8.44213,8.44213 0 0 0 -2.97288,0.50971a6.62812,6.62812 0 0 0 -2.30274,1.43753a6.35389,6.35389 0 0 0 -1.48672,2.22269a7.65808,7.65808 0 0 0 -0.52647,2.86242l0,2.77759a7.60735,7.60735 0 0 0 0.52658,2.85553a6.29893,6.29893 0 0 0 1.48672,2.2087a6.61535,6.61535 0 0 0 2.30363,1.42177a8.53984,8.53984 0 0 0 2.9721,0.50349c1.96745,0 3.62148,-0.57333 4.78335,-1.65791c1.16397,-1.08604 1.77916,-2.63426 1.77916,-4.47726l0,-4.48669c0,-1.84577 -0.61496,-3.40121 -1.77838,-4.49801c-1.16497,-1.0988 -2.81933,-1.67957 -4.78435,-1.67957l0,0.00002zm58.5045,20.08563c-1.59274,0 -3.05904,-0.27189 -4.35768,-0.80803a9.00836,9.00836 0 0 1 -3.28519,-2.31096a10.29001,10.29001 0 0 1 -2.07803,-3.65101c-0.48096,-1.43986 -0.7251,-3.06514 -0.7251,-4.83053c0,-1.76172 0.24425,-3.37801 0.72443,-4.8041a9.99214,9.99214 0 0 1 2.07326,-3.59128a8.90099,8.90099 0 0 1 3.27264,-2.25245c1.28843,-0.5187 2.7465,-0.78172 4.33314,-0.78172a11.6445,11.6445 0 0 1 4.10399,0.69334a8.5314,8.5314 0 0 1 3.09823,1.98477a8.67684,8.67684 0 0 1 1.96056,3.13786a12.06373,12.06373 0 0 1 0.6859,4.16084a19.02602,19.02602 0 0 1 -0.12057,2.24135l-16.46059,0l0,1.34849a7.30536,7.30536 0 0 0 0.48917,2.70454a5.89347,5.89347 0 0 0 1.38957,2.08636a6.17558,6.17558 0 0 0 2.16696,1.34083a8.1226,8.1226 0 0 0 2.81523,0.47285c1.53746,0 2.93958,-0.39369 4.05436,-1.13844a5.45926,5.45926 0 0 0 2.23458,-3.00708l3.54321,0c-0.47863,2.13476 -1.58231,3.80078 -3.37434,5.09344a10.2808,10.2808 0 0 1 -1.43331,0.8359a10.41191,10.41191 0 0 1 -1.56544,0.59675a11.60509,11.60509 0 0 1 -1.70155,0.35883a13.84222,13.84222 0 0 1 -1.84344,0.11946l0.00001,-0.00001zm-0.04252,-20.17123a8.19988,8.19988 0 0 0 -2.72241,0.44021a6.25485,6.25485 0 0 0 -2.12943,1.24347a5.53764,5.53764 0 0 0 -1.38691,1.92571a6.20023,6.20023 0 0 0 -0.49373,2.48272l0,0.66481l13.03807,0l0,-0.9215a6.15316,6.15316 0 0 0 -0.45708,-2.38701a5.26008,5.26008 0 0 0 -1.28987,-1.84466a5.76424,5.76424 0 0 0 -1.99321,-1.18496a7.61745,7.61745 0 0 0 -2.56543,-0.41878l0,-0.00001zm-23.37626,20.17123c-1.59274,0 -3.05904,-0.27189 -4.35768,-0.80803a8.99881,8.99881 0 0 1 -3.28519,-2.31096a10.29001,10.29001 0 0 1 -2.07803,-3.65101c-0.48096,-1.43986 -0.7251,-3.06514 -0.7251,-4.83053c0,-1.76328 0.24425,-3.37956 0.72443,-4.8041a9.99214,9.99214 0 0 1 2.07337,-3.59128a8.9041,8.9041 0 0 1 3.27187,-2.25245c1.28909,-0.5187 2.74717,-0.78172 4.33326,-0.78172a11.6445,11.6445 0 0 1 4.10455,0.69334a8.53162,8.53162 0 0 1 3.09757,1.98477a8.66851,8.66851 0 0 1 1.96112,3.13786a12.05862,12.05862 0 0 1 0.6859,4.16084a19.02946,19.02946 0 0 1 -0.12035,2.24135l-16.46126,0l0,1.34849a7.30536,7.30536 0 0 0 0.48917,2.70454a5.88425,5.88425 0 0 0 1.38957,2.08636a6.17458,6.17458 0 0 0 2.16719,1.34083a8.11517,8.11517 0 0 0 2.815,0.47285c1.53746,0 2.93958,-0.39369 4.05436,-1.13844a5.45637,5.45637 0 0 0 2.23435,-3.00719l3.54321,0c-0.47863,2.13476 -1.58231,3.80078 -3.37434,5.09344a10.19631,10.19631 0 0 1 -2.99897,1.4322a11.61541,11.61541 0 0 1 -1.70155,0.35883a13.84222,13.84222 0 0 1 -1.84244,0.12001l0.00001,0zm-0.04307,-20.17123a8.19899,8.19899 0 0 0 -2.72241,0.44021a6.25485,6.25485 0 0 0 -2.12943,1.24347a5.52398,5.52398 0 0 0 -1.38646,1.92571a6.20023,6.20023 0 0 0 -0.49395,2.48272l0,0.66481l13.0384,0l0,-0.9215a6.14816,6.14816 0 0 0 -0.45708,-2.38701a5.26008,5.26008 0 0 0 -1.28998,-1.84433a5.7628,5.7628 0 0 0 -1.99321,-1.18496a7.61834,7.61834 0 0 0 -2.56587,-0.41912l-0.00001,-0.00001zm-57.77752,20.17123c-2.73307,0 -5.02404,-0.67724 -6.62568,-1.9569a6.29971,6.29971 0 0 1 -1.7886,-2.24213a6.76779,6.76779 0 0 1 -0.62229,-2.84787l3.54321,0c0.01754,1.27533 0.54257,2.35103 1.51858,3.11099s2.35148,1.16242 3.97465,1.16242a8.2122,8.2122 0 0 0 2.11466,-0.25247a4.74415,4.74415 0 0 0 1.59463,-0.73786a3.2752,3.2752 0 0 0 1.00765,-1.19195a3.61271,3.61271 0 0 0 0.34928,-1.60229a3.34858,3.34858 0 0 0 -0.18874,-1.15232a2.58208,2.58208 0 0 0 -0.56745,-0.91239a3.20625,3.20625 0 0 0 -0.94026,-0.66347a5.49434,5.49434 0 0 0 -1.30675,-0.41379l-4.78657,-0.89773a11.19119,11.19119 0 0 1 -2.58929,-0.77195a6.22843,6.22843 0 0 1 -1.83622,-1.22881a4.73327,4.73327 0 0 1 -1.09481,-1.6829a6.01538,6.01538 0 0 1 -0.36471,-2.14831a6.39497,6.39497 0 0 1 0.58742,-2.76227a5.75491,5.75491 0 0 1 1.67313,-2.07281c1.47107,-1.15465 3.57751,-1.76528 6.09132,-1.76528a12.27323,12.27323 0 0 1 3.5461,0.48185a7.7973,7.7973 0 0 1 2.65746,1.36237c1.4513,1.17141 2.23846,2.83743 2.27598,4.81843l-3.54399,0c-0.11103,-2.60906 -1.77183,-3.93202 -4.93556,-3.93202a7.88124,7.88124 0 0 0 -2.03173,0.24203a4.4153,4.4153 0 0 0 -1.4966,0.69501a3.02362,3.02362 0 0 0 -0.92527,1.10158a3.2833,3.2833 0 0 0 -0.3142,1.44653a3.12576,3.12576 0 0 0 0.37748,1.5661a2.57575,2.57575 0 0 0 1.06794,1.01398l0.005,0.00211c0.87953,0.37748 1.27444,0.51326 2.1936,0.68835l4.40187,0.81158a10.4158,10.4158 0 0 1 2.54067,0.75674a6.00994,6.00994 0 0 1 1.80968,1.24413a4.87128,4.87128 0 0 1 1.08615,1.73097a6.46813,6.46813 0 0 1 0.36338,2.2288a6.44082,6.44082 0 0 1 -0.6184,2.84221a5.932,5.932 0 0 1 -1.76317,2.12699c-1.55045,1.17908 -3.77725,1.80236 -6.4396,1.80236zm39.72006,-0.42766l-3.5854,0l0,-18.95075a4.42174,4.42174 0 0 1 0.20517,-1.41245a2.53134,2.53134 0 0 1 0.61341,-1.00277a2.59962,2.59962 0 0 1 1.02875,-0.60441a4.72528,4.72528 0 0 1 1.46263,-0.20439l7.66841,0l0,2.9438l-7.39263,0l-0.00033,19.23097l-0.00001,0z"
+            id="svg_5"/>
     </g>
-    <g transform="matrix(0.723327,0,0,0.716405,24.4284,25.3505)">
-        <g transform="matrix(9.26626,0,0,9.26626,16.011,72.835)">
-            <path d="M6.002,5.5C6.002,6.323 5.325,7 4.502,7C3.679,7 3.002,6.323 3.002,5.5C3.002,4.677 3.679,4 4.502,4C5.325,4 6.002,4.677 6.002,5.5Z" style="fill:rgb(125,125,125);fill-rule:nonzero;"/>
-        </g>
-        <g transform="matrix(9.26626,0,0,9.26626,16.011,72.835)">
-            <path d="M1.5,2C0.677,2 -0,2.677 0,3.5L0,12.5C0,13.323 0.677,14 1.5,14L14.5,14C15.323,14 16,13.323 16,12.5L16,3.5C16,2.677 15.323,2 14.5,2L1.5,2ZM14.5,3C14.774,3 15,3.226 15,3.5L15,9.5L11.225,7.553C11.033,7.457 10.8,7.495 10.648,7.646L6.938,11.356L4.278,9.584C4.081,9.453 3.816,9.479 3.648,9.646L1.002,12L1.002,12.54C1.001,12.527 1,12.513 1,12.5L1,3.5C1,3.226 1.226,3 1.5,3L14.5,3Z" style="fill:rgb(125,125,125);fill-rule:nonzero;"/>
-        </g>
-    </g>
-    <g transform="matrix(1.89682,0,0,1.89682,-1.5642,-167.039)">
-        <text x="18.181px" y="200.157px" style="font-family:'Arial-BoldMT', 'Arial', sans-serif;font-weight:700;font-size:12px;fill:rgb(0,102,204);">NO IMAGE</text>
+    <g transform="matrix(1.89682 0 0 1.89682 -1.5642 -167.039)" opacity="0.5">
+      <text x="23.43384" y="165.81385" font-family="'Arial', sans-serif" font-weight="400" font-size="10" fill="rgb(0,0,0)">NO IMAGE</text>
+      <text x="21.55265" y="180.81385" font-family="'Arial', sans-serif" font-weight="400" font-size="10" fill="rgb(0,0,0)">AVAILABLE</text>
     </g>
+  </g>
 </svg>

data/app/controllers/spree/locale_controller.rb

@@ -10,6 +10,11 @@ module Spree
       new_locale = (params[:switch_to_locale] || params[:locale]).to_s
 
       if new_locale.present? && supported_locale?(new_locale)
+
+        if try_spree_current_user && try_spree_current_user.selected_locale != new_locale
+          try_spree_current_user.update!(selected_locale: new_locale)
+        end
+
         if should_build_new_url?
           redirect_to BuildLocalizedRedirectUrl.call(
             url: request.env['HTTP_REFERER'],

data/app/controllers/spree/products_controller.rb

@@ -52,7 +52,7 @@ module Spree
     end
 
     def load_product
-      @product = current_store.products.for_user(try_spree_current_user).friendly.find(params[:id])
+      @product = find_with_fallback_default_locale { current_store.products.for_user(try_spree_current_user).friendly.find(params[:id]) }
     end
 
     def load_taxon

data/app/controllers/spree/taxons_controller.rb

@@ -30,7 +30,7 @@ module Spree
     end
 
     def load_taxon
-      @taxon = current_store.taxons.friendly.find(params[:id])
+      @taxon = find_with_fallback_default_locale { current_store.taxons.friendly.find(params[:id]) }
     end
 
     def load_products

data/app/helpers/spree/frontend_helper.rb

@@ -18,7 +18,7 @@ module Spree
       image_path ||= if logo_attachment&.attached? && logo_attachment&.variable?
                        main_app.cdn_image_url(logo_attachment.variant(resize: '244x104>'))
                      elsif logo_attachment&.attached? && logo_attachment&.image?
-                       main_app.cdn_image_url(current_store.logo)
+                       main_app.cdn_image_url(logo_attachment)
                      else
                        asset_path('logo/spree_50.png')
                      end
@@ -251,7 +251,7 @@ module Spree
     end
 
     def price_filter_values
-      ActiveSupport::Deprecation.warn(<<-DEPRECATION, caller)
+      Spree::Deprecation.warn(<<-DEPRECATION, caller)
         `FrontendHelper#price_filter_values` is deprecated and will be removed in Spree 5.0.
         Please use `ProductsFiltersHelper#price_filters` method
       DEPRECATION

data/app/helpers/spree/navigation_helper.rb

@@ -3,7 +3,7 @@ require 'digest'
 module Spree
   module NavigationHelper
     def spree_navigation_data
-      ActiveSupport::Deprecation.warn(<<-DEPRECATION, caller)
+      Spree::Deprecation.warn(<<-DEPRECATION, caller)
         NavigationHelper#spree_navigation_data is deprecated and will be removed in Spree 5.0.
         Please migrate to the new navigation cms system.
       DEPRECATION
@@ -20,7 +20,7 @@ module Spree
     end
 
     def spree_nav_cache_key(section = 'header')
-      ActiveSupport::Deprecation.warn(<<-DEPRECATION, caller)
+      Spree::Deprecation.warn(<<-DEPRECATION, caller)
         NavigationHelper#spree_nav_cache_key is deprecated and will be removed in Spree 5.0.
         Please migrate to the new navigation cms system.
       DEPRECATION

data/app/helpers/spree/taxons_helper.rb

@@ -4,7 +4,7 @@ module Spree
     # that we can use configurations as well as make it easier for end users to override this determination.  One idea is
     # to show the most popular products for a particular taxon (that is an exercise left to the developer.)
     def taxon_preview(taxon, max = 4)
-      ActiveSupport::Deprecation.warn(<<-DEPRECATION, caller)
+      Spree::Deprecation.warn(<<-DEPRECATION, caller)
         TaxonsHelper is deprecated and will be removed in Spree 5.0.
         Please remove any `helper 'spree/taxons'` from your controllers.
       DEPRECATION

data/app/services/spree/build_localized_redirect_url.rb

@@ -4,9 +4,12 @@ module Spree
   class BuildLocalizedRedirectUrl
     prepend Spree::ServiceModule::Base
 
-    LOCALE_REGEX = /^\/[A-Za-z]{2}\/|^\/[A-Za-z]{2}-[A-Za-z]{2}\/|^\/[A-Za-z]{2}$|^\/[A-Za-z]{2}-[A-Za-z]{2}$/.freeze
+    LOCALE_REGEX = /^\/([A-Za-z]{2})\/|^\/([A-Za-z]{2}-[A-Za-z]{2})\/|^\/([A-Za-z]{2})$|^\/([A-Za-z]{2}-[A-Za-z]{2})$/.freeze
 
-    SUPPORTED_PATHS_REGEX = /\/(products|t\/|cart|checkout|addresses|content|pages)/.freeze
+    SUPPORTED_PATHS_REGEX = /\/(products|t\/|cart|checkout|addresses|content|pages|login|account|logout|signup|users)/.freeze
+
+    PRODUCT_PATH_REGEX = /\/products\/(\S+)/.freeze
+    TAXON_PATH_REGEX = /\/t\/(\S+)/.freeze
 
     # rubocop:disable Lint/UnusedMethodArgument
     def call(url:, locale:, default_locale: nil)
@@ -23,11 +26,12 @@ module Spree
       success(
         url: URI(url),
         locale: locale,
+        default_locale: default_locale,
         default_locale_supplied: default_locale_supplied?(locale, default_locale)
       )
     end
 
-    def generate_new_path(url:, locale:, default_locale_supplied:)
+    def generate_new_path(url:, locale:, default_locale:, default_locale_supplied:)
       unless supported_path?(url.path)
         return success(
           url: url,
@@ -38,11 +42,20 @@ module Spree
         )
       end
 
-      new_path = if default_locale_supplied
-                   maches_locale_regex?(url.path) ? url.path.gsub(LOCALE_REGEX, '/') : url.path
-                 else
-                   maches_locale_regex?(url.path) ? url.path.gsub(LOCALE_REGEX, "/#{locale}/") : "/#{locale}#{url.path}"
-                 end
+
+      locale_url_match = url.path.match(LOCALE_REGEX)
+      previous_locale = locale_url_match ? locale_url_match[1] || default_locale : default_locale
+
+      product_path_match = url.path.match(PRODUCT_PATH_REGEX)
+      taxon_path_match = url.path.match(TAXON_PATH_REGEX)
+
+      if product_path_match
+        new_path = generate_product_path(product_path_match, previous_locale, locale, default_locale, default_locale_supplied)
+      elsif url.path.match(TAXON_PATH_REGEX)
+        new_path = generate_taxon_path(taxon_path_match, previous_locale, locale, default_locale, default_locale_supplied)
+      else
+        new_path = generate_regular_page_path(default_locale_supplied, url, locale)
+      end
 
       success(
         url: url,
@@ -97,5 +110,32 @@ module Spree
     def builder_class(url)
       url.scheme == 'http' ? URI::HTTP : URI::HTTPS
     end
+
+    def generate_product_path(product_path_match, previous_locale, locale, default_locale, default_locale_supplied)
+      product = begin
+        Mobility.with_locale(previous_locale) { Spree::Product.friendly.find(product_path_match[1]) }
+      rescue ActiveRecord::RecordNotFound
+        Mobility.with_locale(default_locale) { Spree::Product.friendly.find(product_path_match[1]) }
+      end
+
+      new_slug = product.slug(locale: locale) || product.slug(locale: default_locale)
+      new_path_slug = "/products/#{new_slug}"
+      default_locale_supplied ? new_path_slug : "/#{locale}/#{new_path_slug}"
+    end
+
+    def generate_taxon_path(taxon_path_match, previous_locale, locale, default_locale, default_locale_supplied)
+      taxon = Mobility.with_locale(previous_locale) { Spree::Taxon.friendly.find(taxon_path_match[1]) }
+      new_slug = taxon.permalink(locale: locale) || taxon.permalink(locale: default_locale)
+      new_path_slug = "/t/#{new_slug}"
+      default_locale_supplied ? new_path_slug : "/#{locale}/#{new_path_slug}"
+    end
+
+    def generate_regular_page_path(default_locale_supplied, url, locale)
+      if default_locale_supplied
+        maches_locale_regex?(url.path) ? url.path.gsub(LOCALE_REGEX, '/') : url.path
+      else
+        maches_locale_regex?(url.path) ? url.path.gsub(LOCALE_REGEX, "/#{locale}/") : "/#{locale}#{url.path}"
+      end
+    end
   end
 end

data/app/views/spree/addresses/new.html.erb

@@ -1,7 +1,7 @@
 <%= render 'spree/shared/error_messages', target: @address %>
 <div class="col-lg-6 offset-lg-3">
   <h3 class="spree-header spree-mb-large spree-mt-large"><%= Spree.t(:new_address, scope: :address_book) %></h3>
-  <%= form_for @address, html: { id: 'checkout_form_address' } do |f| %>
+  <%= form_for @address, url: spree.addresses_path, html: { id: 'checkout_form_address' } do |f| %>
   <div class="form-group checkout-content-inner-field mb-5 has-float-label">
     <%= f.text_field :label, class: 'spree-flat-input', placeholder: Spree.t(:address_name_placeholder, scope: :address_book) %>
     <%= f.label :address_name, Spree.t(:label, scope: :address_book) %>