Cillian O'Ruanaidh
541a340dcf
If an OrderCycle or Spree::ShippingMethod is destroyed then remove it's associated OrderCycleShippingMethod records too
2022-09-30 13:13:39 +01:00
Cillian O'Ruanaidh
593da4996f
A shop won't be shown as open if it doesn't have useable shipping method so these shipping method validations are really necessary
2022-09-30 13:13:39 +01:00
Cillian O'Ruanaidh
ed13ee6cbc
Fix association alignment in OrderCycle
2022-09-30 13:13:39 +01:00
Cillian O'Ruanaidh
564e4d802c
Don't use :html_safe with payment method name in checkout options in case it contains something malicious
...
Co-authored-by: Maikel <maikel@email.org.au >
2022-09-30 13:13:39 +01:00
Cillian O'Ruanaidh
747c88fb35
Update the Shop::OrderCyclesList service so it's clearer what kind of order cycles are being fetched
...
Before the Shop::OrderCyclesList service would return order cycles even if they are not ready for checkout and we had a check before calling the service in BaseController which would return OrderCycle.where('false'). It seems like this check should be part of the service too.
2022-09-30 13:13:39 +01:00
Cillian O'Ruanaidh
f4a4f7c9ff
Remove validations checking order cycle has shipping methods
...
Instead we will make sure the order cycle is not available on the shopfront if it is doesn't have valid shipping methods. This will preven the issue where if one distributor deletes their shipping method, we don't want to invalidate the order cycle for all other distributors.
Co-authored-by: Maikel <maikel@email.org.au >
2022-09-30 13:13:39 +01:00
Cillian O'Ruanaidh
81730f725d
Enterprises shouldn't be considered ready for checkout if it only has backend shipping methods
2022-09-30 13:13:39 +01:00
Cillian O'Ruanaidh
7bd56007bd
Don't use :html_safe in case shipping method name contains something malicious in app/views/admin/order_cycles/checkout_options.html.haml
...
Co-authored-by: Maikel <maikel@email.org.au >
2022-09-30 13:13:39 +01:00
Cillian O'Ruanaidh
d9de35799d
Array difference operator is neater than reject in app/views/admin/order_cycles/checkout_options.html.haml
...
Co-authored-by: Maikel <maikel@email.org.au >
2022-09-30 13:13:39 +01:00
Cillian O'Ruanaidh
67d4c38550
Rename :preferred_shipping_methods to :selected_shipping_methods on OrderCycle
...
It's a clearer name because 'preferred' implies there could be other unpreferred shipping methods available as well.
Co-authored-by: Maikel <maikel@email.org.au >
2022-09-30 13:13:39 +01:00
Cillian O'Ruanaidh
f25de984d2
Use .empty? instead of !exists? in app/models/order_cycle_shipping_method.rb
...
Co-authored-by: Maikel <maikel@email.org.au >
2022-09-30 13:13:39 +01:00
Cillian O'Ruanaidh
9a511e9e94
Rubocop adjustments
2022-09-30 13:13:39 +01:00
Cillian O'Ruanaidh
9296686384
Make backend, frontend scopes on Spree::ShippingMethod neater
...
Co-authored-by: Co-authored-by: Maikel <maikel@email.org.au >
2022-09-30 13:13:39 +01:00
Cillian O'Ruanaidh
f6c754839b
Make OrderCycleShippingMethod inherit from ApplicationRecord
2022-09-30 13:13:39 +01:00
Cillian O'Ruanaidh
fc4f951a1a
Only require OrderCycleShippingMethod records if people want to override the default shipping methods
...
It makes things much simpler if we return all shipping methods by default without needing OrderCycleShippingMethod records to be added to the database.
Co-authored-by: Maikel <maikel@email.org.au >
2022-09-30 13:13:39 +01:00
Cillian O'Ruanaidh
a46b77d10c
Ensure hack for showing products on a shop with closed order cycles also works if an order cycle has no shipping methods
...
If a distributor order cycle has no shipping methods it will be invalid. This is a bit confusing because adding a check for :invalid seems like it would be better if it was done in the Shop::OrderCyclesList service but the hack doesn't work if you put it in there, it seems like something needs a refactor.
2022-09-30 13:13:39 +01:00
Cillian O'Ruanaidh
bff7650b35
Change :available_shipping_methods helper to use new OrderAvailableShippingMethods service.
2022-09-30 13:13:39 +01:00
Cillian O'Ruanaidh
855ec1a708
Add new 'Checkout options' step to the edit order cycle form so people can attach shipping methods
2022-09-30 13:13:39 +01:00
Cillian O'Ruanaidh
1e817af5aa
Validate deleting a shipping method or switching it to backoffice only doesn't invalidate any order cycles
2022-09-30 13:13:39 +01:00
Cillian O'Ruanaidh
48c2e48b24
Update the OrderCycleForm service so it supports attaching shipping methods
2022-09-30 13:13:39 +01:00
Cillian O'Ruanaidh
ca97a7f52d
Add :shipping_methods association to OrderCyle and validations
2022-09-30 13:13:39 +01:00
Cillian O'Ruanaidh
9a6e8a1113
Add an OrderCycleShippingMethod model to handle attaching shipping methods to order cycles
2022-09-30 13:13:39 +01:00
Cillian O'Ruanaidh
94d71b8dce
Remove extra unnecessary :display_on_checkout scope and reuse :frontend scope instead
2022-09-30 13:13:39 +01:00
Cillian O'Ruanaidh
a5daee39e3
Extract out a DISPLAY_ON_OPTIONS constant in Spree::ShippingMethod instead of magic strings
2022-09-30 13:13:39 +01:00
Cillian O'Ruanaidh
37617f63ea
Remove non-functional :backend scope from Spree::ShippingRate
...
It finds shipping methods where 'display_on != front_end' but :front_end values were removed in a1317be19b/db/migrate/20200508101630_convert_frontend_shipping_method_to_both.rb
2022-09-30 13:13:39 +01:00
Cillian O'Ruanaidh
9b5f743fa5
Extract out a OrderCycle#simple? method so it can be used in models
2022-09-30 13:13:39 +01:00
binarygit
ebe4a3d6ab
Add StimulusReflex
2022-09-29 16:03:45 +02:00
Maikel Linke
8011d85968
Clarify updating only pre-existing customers
2022-09-29 12:06:06 +02:00
Maikel Linke
a7de56460d
Further simplify Order by outsourcing to service class
2022-09-29 12:06:06 +02:00
Maikel Linke
1f19642dad
Simplify Order by outsourcing to service class
...
This is work in progress and calling the service will be simplified in a
few commits.
2022-09-29 12:06:06 +02:00
Maikel Linke
33d6454dd3
Simplify with guard clause
2022-09-29 12:06:06 +02:00
Maikel Linke
a0260c4ff7
Move customer update logic to own service file
...
The Order class is too big already. We can move more code in the next
commits.
2022-09-29 12:06:06 +02:00
Maikel Linke
cec81a3ae6
Clarify condition to create customer record
2022-09-29 12:06:06 +02:00
Maikel Linke
37eac5ed49
Remove dead code branch in customer check
...
We only try to create a customer when none is present. So the check for
validating the customer always returned false because we didn't have a
customer.
2022-09-29 12:06:06 +02:00
Maikel Linke
b232fa3d0c
Deal with conflicting customer entries
2022-09-29 12:06:06 +02:00
Maikel Linke
f6ac02dce5
Update customer's email after user changed it
...
This may fail if there's already a customer record with the same email
address for the same enterprise. I will fix that in the next commit.
2022-09-29 12:06:06 +02:00
Maikel Linke
9dbba35019
Find customers by user id as well as email
...
Also fixing up a spec which became brittle due to too much mocking.
2022-09-29 12:06:06 +02:00
Maikel Linke
cf634d8d9b
Simplify customer association
2022-09-29 12:06:06 +02:00
Maikel Linke
5fefd3b14b
Remove useless customer loading and clarify name
...
The method `associate_customer` only loads a customer but doesn't
actually associate one. So the deleted line doesn't have any effect.
The intention was to reset the customer after switching shops but the
before_validation logic on the order model takes care of that already.
I'm renaming this private method here for clarity.
2022-09-29 12:06:06 +02:00
Maikel Linke
0d1f48ac0d
Simplify order-customer logic
2022-09-29 12:06:06 +02:00
Maikel Linke
d81037d658
Simplify branching logic in SearchesController
2022-09-29 09:30:21 +02:00
Maikel Linke
12d7db3dd6
More efficient enterprise access check
2022-09-29 09:30:21 +02:00
Jean-Baptiste Bellet
cdf71b419f
Search within all enterprises if user is the super admin
2022-09-29 09:30:21 +02:00
Filipe
958c6fe8f3
Merge pull request #9685 from filipefurtad0/remove_js_tracking_code
...
Removes matomo JS tracking code
2022-09-28 23:15:23 +01:00
Ashwini Seshadri
edee5c693b
Changed new subscription dialog to use tom-select from select2
...
fixed z-index, text-alignment in the dropdown menu to left in new subscription modal, replaced click_link with page.find().click in subscription specs, removed href in subscription index
2022-09-28 10:47:39 +02:00
Maikel Linke
aec28e0807
Simplify customer model requiring enterprise
2022-09-27 13:14:18 +10:00
Maikel Linke
be31b9a897
Document purpose of customer model
2022-09-27 13:14:18 +10:00
Rachel Arnould
e98d4af630
Merge pull request #9659 from saunmanoj888/fix-bulk-product-update-unit-value
...
Allow to change unit value for numbers with a comma separator on bulk product update
2022-09-21 13:04:08 +02:00
Maikel
5173ddb7a0
Merge pull request #9675 from filipefurtad0/split_build_consumer_tests
...
Makes build run all specs; fixes failing specs
2022-09-20 11:20:52 +10:00
filipefurtad0
136a4df4d9
Removes matomo JS tracking code
2022-09-19 15:26:07 +01:00
