Maikel Linke
cec9d2987e
Name order attributes similar to other text
...
Rails' auto-generated names used in error messages were a bit cryptic
for users.
2023-01-25 15:49:44 +11:00
Filipe
561458ce43
Merge pull request #9933 from Laurel16/instagram
...
Admin, Enterprise Settings, Social: Add instagram handler validator
2022-12-20 12:40:57 +00:00
Laurel16
bfd396e644
Add instagram handler validator
...
update entreprise model to match the correct pattern for instagram attribute & add migration to correct wrong links in db + test
2022-12-08 15:22:05 +01:00
filipefurtad0
8ee5050a49
Fixes deprecation warnings on tax_rate_spec
2022-12-06 15:49:28 +00:00
filipefurtad0
2e4a8f8ae8
Fixes deprecation warnings on payment_spec
2022-12-06 15:49:19 +00:00
filipefurtad0
b66d263bc6
Replaces stub with allow
2022-11-23 15:12:09 +01:00
Vinicius Uehara
6da442eb97
Fix trailing whitespace
2022-10-30 21:42:48 -03:00
Vinicius Uehara
f6cc9fca26
Prioritize attribute errors over product validations
...
With product validations being prioritized, custom and
insightful error messages were being overwriten by
general and ambiguous model validations, which
were confusing users
2022-10-30 20:02:08 -03:00
Rachel Arnould
2652bc086a
Merge pull request #9755 from cillian/order-cycle-payment-methods
...
Let people choose which payment methods are available to customers on order cycles
2022-10-26 20:10:34 +02:00
Cillian O'Ruanaidh
62cd507fb9
Stub Spree::Config.stripe_connect_enabled instead of changing it before and back after tests
...
It's less code and sometimes there can be issues when config cache values are changed.
Co-authored-by: Maikel <maikel@email.org.au >
2022-10-21 17:21:31 +01:00
Cillian O'Ruanaidh
2c14aecf4f
Extract a OrderCycleClone service
...
Before it was giving a Rubocop error, probably not a bad idea anyway.
2022-10-21 17:21:31 +01:00
Cillian O'Ruanaidh
4e6d64c0a1
Let people choose which payment methods are available to customers on order cycles
2022-10-21 17:21:31 +01:00
Matt-Yorkley
617164684c
Configure OIDC
2022-10-18 11:32:14 +11:00
Ashwini Seshadri
590a09f069
Fixed the permissions relationship, so the shop displays only suppliers and does not display distributors in producers list
...
and updated relevant tests
2022-10-12 16:48:31 +11:00
jibees
0c64720a9e
Merge pull request #9710 from mkllnk/9002-customer-association-updates
...
Associate and update customer records when ordering
2022-09-30 16:36:01 +02:00
Cillian O'Ruanaidh
5207dbf8c6
OrderCycle#distributor_shipping_methods should return all attachable ones by default per distributor, not per all distributors
2022-09-30 13:13:39 +01:00
Cillian O'Ruanaidh
a53a3259a8
Connect DistributorShippingMethods to OrderCycles instead of Spree::ShippingMethods
...
Before if a shipping method was shared between multiple distributors it could only be disabled/enabled on that order cycle for all the distributors which have that shipping method e.g. you couldn't select that shipping method for one distributor but disable it for another.
2022-09-30 13:13:39 +01:00
Cillian O'Ruanaidh
80b7a5d39a
Remove OrderCycleShippingMethod model and use a :has_and_belongs_to_many association instead
...
Before the OrderCycleShippingMethod had a validation which checked the shipping method belonged to the order cycle distributor. Instead of this validation this just ignores shipping methods which don't belong to one of the order cycle's distributors when they are being attached in the OrderCycleForm service. This pattern is already being used in the OrderCycleForm service for ignoring Schedules that the person doesn't own.
Co-authored-by: Maikel <maikel@email.org.au >
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
a3a52a07b7
Build shipping method with a category so it's valid in the test
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
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
cc5daf51b1
Expect to be_valid instead of checking presence of specific error spec/models/spree/shipping_method_spec.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
0671e52a29
Undo changes to tests, now that order cycle returns all shipping methods by default and doesn't explicitly require OrderCycleShippingMethods anymore
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
4e0bf75ecf
Get tests broken because of new order cycle shipping method validations working again
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
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
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
9b5f743fa5
Extract out a OrderCycle#simple? method so it can be used in models
2022-09-30 13:13:39 +01: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
93da64f466
Spec for duplicate customers after changing email
2022-09-29 12:06:06 +02:00
Maikel Linke
ccbf20a73b
Replace spec of customer's internal logic
...
Specs should test public methods. Private methods should be able to
change without specs breaking.
The specs were also just mirroring the code and didn't really have any
meaning. So I wrote new ones which are hopefully clearer.
There's actually a case which I don't quite understand. Why don't we
require a customer for a new complete order? It means that we don't have
a customer creating it but then it's added when updating the order.
Seems inconsistent.
2022-09-29 12:06:06 +02:00
Jean-Baptiste Bellet
53978de632
Create a new report that show revenues (incl. or excl. taxes) by hub
...
+ Create spec
2022-09-08 09:04:44 +02:00
jibees
20ee0d5009
Merge pull request #9301 from mkllnk/3975-unsupported-image
...
Allow SVG images for products and show errors when uploading unsupported file
2022-07-21 16:56:11 +02:00
Filipe
b977bc77c8
Merge pull request #9272 from jibees/7905-retrieve-order-already-placed-on-user-confirmation-with-customer-email
...
On user confirmation, retrieve and link all orders to the new user that were already placed with the same email
2022-06-21 18:12:58 +01:00
François Turbelin
606a56a64d
Improve specs
2022-06-21 10:08:12 +02:00
François Turbelin
76ea7089d9
Implement suggestions
2022-06-21 10:08:12 +02:00
François Turbelin
39a6b5d20f
Add disabled_at logic on spree users
2022-06-21 10:08:12 +02:00
Jean-Baptiste Bellet
bc43028cb1
On User confirmation, link all already placed orders to this new user
...
if user.email == customer.email
Co-Authored-By: Maikel <maikel@email.org.au >
2022-06-20 15:39:22 +02:00
Maikel Linke
004c7eef9e
Show SVG product images
2022-06-14 15:35:55 +10:00
Filipe
43888f7f3c
Merge pull request #9126 from mkllnk/active-storage
...
[Breaking] Replace Paperclip with Active Storage
2022-06-07 11:14:39 +01:00
Filipe
4a15ed9b39
Merge pull request #9190 from georgethoppil/duplicate-transaction-fees
...
Destroy all adjustments on cart empty
2022-06-02 11:36:27 +01:00
Maikel Linke
b7efa1b018
Replace Paperclip on Spree::Image
2022-06-01 17:16:55 +10:00
