raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-10 23:07:47 +00:00
Code Issues Packages Projects Releases Wiki Activity
26,679 Commits 20 Branches 453 Tags
c7c19e47de2a53c2cae6befb56f7980cc78bb80c
Commit Graph

1236 Commits

Author SHA1 Message Date
Gaetan Craig-Riou
2e10336a47 Add ability to manage voucher for enterprise user 
Update spec accordingly
 2023-03-28 13:39:29 +11:00
Filipe
9ea6fa5c44 Merge pull request #9687 from dacook/9616-order-cycle-open-webhook 
Add webhook triggered on Order Cycle Open
 2023-03-16 17:24:22 +00:00
David Cook
778baba118 User may have many WebhookEndpoints [migration] 
Although we won't be allowing multiple in the this PR, we certainly plan to in the future.

The migration helper add_reference couldn't handle the custom column name, so I had to put it together manually.
 2023-03-07 15:38:50 +11:00
Maikel Linke
918e583d01 Account for Rails 7 rounding in time spec 
Storing a timestamp to the database has less accuracy than a Ruby Time
object. So `updated_at` changes after being written and loaded from the
database. Rails 7 accounts for that by rounding it in the model already
before it's written to the database. That made one spec fail.
 2023-03-03 12:34:55 +11:00
Filipe
ba46756cba Merge pull request #10445 from cyrillefr/Remov-I18nt-keys-from-automated-tests#9499 
Remov i18nt keys from automated tests#9499
 2023-02-16 17:51:08 +00:00
Rachel Arnould
1a7598d96d Merge pull request #10428 from jibees/9145-Splitcheckout,-add-error-message-when-no-shipping-methods-are-available-to-the-customer 
SplitCheckout: improve error messages in flash banner to improve user experience
 2023-02-16 15:33:12 +01:00
cyrillefr
b3ad5aeaca Remove I18n keys in model specs 2023-02-16 14:28:14 +01:00
Jean-Baptiste Bellet
0a3d362282 Still improve error message for Billing address 
```
"Bill" is a person's name, and I don't know his address
```

;)
 2023-02-15 10:07:59 +01:00
Jean-Baptiste Bellet
4cea7b1957 Improve error message, and use the same than the view 2023-02-15 09:52:24 +01:00
Jean-Baptiste Bellet
88607a3dce Improve bill address error message 
"(Street + House number)" instead of "address1"
and "postcode" instead of "zipcode"
 2023-02-15 09:52:24 +01:00
Ana Nunes da Silva
f4980fa84d Update void payments to checkout on resumed order 2023-02-07 12:29:59 +00:00
Ana Nunes da Silva
b48b3ad42b Update: Untaken cash payments to void on cancelled order 2023-02-07 12:27:07 +00:00
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
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
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
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
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
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
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
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
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
a5daee39e3 Extract out a DISPLAY_ON_OPTIONS constant in Spree::ShippingMethod instead of magic strings 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
Maikel Linke
4a0ed99919 Replace Paperclip on Enterprise model 
We configured Paperclip to convert images to JPG in some cases but I
omitted that here because we don't need it. If an image is better
represented as PNG or another format then the user should be able to
choose that.

Some specs were also testing the generated URL but the Active Storage
URL doesn't contain a style name anymore and it's not helpful to test
the URL.
 2022-06-01 17:16:55 +10:00
Maikel Linke
727eef3c4f Replace Paperclippable ContentConfig 
The old Paperclip configuration was very clever and easy to use but it
was also a complicated implementation building on the complicated Spree
preference system.

I simplified this with Active Storage, storing simple references to blob
ids and default URLs as backup.
 2022-06-01 17:16:54 +10:00
georgethoppil
03b24bfc38 Destroy all adjustments on cart empty 2022-05-17 20:21:47 -04:00
Sebastian Castro
452a3fa933 Reports Refactor 2: Merge Spree::reports into Admin::Reports 2022-05-12 16:54:13 +02:00
GeorgeThoppil
8903496a1b Optional restocking items 2022-05-06 10:55:24 -04:00