raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-01-27 21:06:49 +00:00
Code Issues Packages Projects Releases Wiki Activity
18,785 Commits 18 Branches 451 Tags
dbef7b60a683fa857032459b3a033eb704ebbab2
Commit Graph

1705 Commits

Author SHA1 Message Date
Andy Brett
84689c43be Merge pull request #6534 from andrewpbrett/sca-emails 
Send email when SCA authorization is required for admin payment
 2021-01-21 13:53:35 -08:00
Andy Brett
3ef4a74b84 Merge pull request #6655 from Matt-Yorkley/summing-amounts 
Improve performance on summing adjustments and payment
 2021-01-21 10:58:10 -08:00
Matt-Yorkley
d8b795ebee Merge pull request #6679 from Matt-Yorkley/soft-delete-enterprise-fees 
Soft-delete Enterprise Fees
 2021-01-21 19:57:29 +01:00
Andy Brett
5f1669280c update to rspec 3 expect syntax 2021-01-21 09:17:07 -08:00
Andy Brett
5c0408c68c pass paymentIntent ID to capture 2021-01-21 08:48:38 -08:00
Andy Brett
e31d566f7f Merge pull request #6283 from luisramos0/sets 
Move sets out of app/models to app/services/sets
 2021-01-20 19:22:15 -08:00
Matt-Yorkley
6a9505cf67 Ensure adjustments can access soft-deleted originators 
Note: originator is generally an EnterpriseFee or a TaxRate
 2021-01-19 16:46:14 +00:00
Matt-Yorkley
5593da2928 Delete dead code #update_hooks 
These hooks allow Spree core to be modified by other gems and apps without changing Spree code. We don't use it. #YAGNI
 2021-01-15 16:49:45 +00:00
Pau Pérez Fabregat
f240402c43 Merge pull request #6654 from Matt-Yorkley/update-without-callbacks 
Remove #update_attributes_without_callbacks
 2021-01-15 12:24:42 +01:00
Andy Brett
7ca81f45d0 Merge pull request #6641 from Matt-Yorkley/shipping-method-soft-deletion 
Ensure ShippingMethod is correctly using soft-deletion
 2021-01-14 11:53:19 -08:00
Luis Ramos
8e65d29b02 Move sets to specific services namespace 2021-01-14 09:41:07 +00:00
Pau Pérez Fabregat
9db4f9be15 Merge pull request #6634 from Matt-Yorkley/jobs-cleanup 
Jobs cleanup
 2021-01-14 10:08:15 +01:00
Maikel
168958311a Merge pull request #6656 from Matt-Yorkley/payment-identifier 
Fix payment identifier generation
 2021-01-14 17:34:38 +11:00
Maikel
fbda1fffd7 Merge pull request #6653 from Matt-Yorkley/dead-code-available-payment 
Dead code: #has_available_payment
 2021-01-14 17:33:07 +11:00
Andy Brett
c29d57b54e Merge pull request #6369 from Matt-Yorkley/broken-variants 
Fix variant data inconsistencies
 2021-01-13 11:10:44 -08:00
Matt-Yorkley
18c9e16303 Fix payment identifier generation 
Upstream fix from Spree 2.2.

See: 4e747187d7
 2021-01-13 17:37:22 +00:00
Matt-Yorkley
aacd942697 Update specs that stub associations inaccurately 
These specs fail if the code is using #sum on stubbed objects that don't respond to it nicely.
 2021-01-13 17:32:20 +00:00
Matt-Yorkley
305ae103ce Use :create instead of :build in order updater specs 
The order updater requires a persisted order
 2021-01-13 17:09:02 +00:00
Matt-Yorkley
8d338a06f3 Delete dead code #has_available_payment 
This is removed in Spree 2.2, as it serves no purpose.

See: 0617bdce30
 2021-01-13 15:48:02 +00:00
Matt-Yorkley
46ff247bc9 Ensure ShippingMethod#destroy is using soft-deletion 
25f5c2daf8

We've already applied some of the changes in this commit during previous Spree upgrade work, but there were a couple of bits missing.
 2021-01-11 15:46:38 +00:00
Pau Perez
539c5d067a Update order payment_total when voiding a payment 
As is, `payment_total` is only increased after successfully processing
a payment and never updated. This inconsistency breaks
`CustomerWithBalance` which relies on it.

Needless to say that if we keep this denormalized column, we better make
it consistent. I investigated current Spree's master branch (709e686cc0)
and they also realized it was broken. Now `Payment` runs the following
from the `after_save` `update_order` callback.

```rb
order.updater.update_payment_total if completed? || void?
```

I also took the chance to rearrange tests a bit.
 2021-01-11 15:50:19 +01:00
Pau Perez
04930877dd Test that payment_total is stored after payment 
CustomerWithBalance totally relies on `spree_orders.payment_total` so we
better cover it with tests.
 2021-01-11 15:50:19 +01:00
Andy Brett
c12abf8057 Merge pull request #6617 from Matt-Yorkley/stock-items-variant-deletion 
Stock items and variant deletion
 2021-01-09 12:12:24 -08:00
Matt-Yorkley
ca42b1fff7 Remove ConfirmSignupJob 2021-01-09 11:38:29 +00:00
Matt-Yorkley
6a7f795f64 Remove WelcomeEnterpriseJob 2021-01-09 11:33:10 +00:00
Andy Brett
3877721209 Merge pull request #6631 from Matt-Yorkley/actionmailer-deliver 
[Deprecation] Replace ActionMailer#deliver with ActionMailer#deliver_now
 2021-01-08 17:42:31 -08:00
Matt-Yorkley
ff962c1c9b Change various Mailer invocations from #deliver_now to #deliver_later 2021-01-08 23:18:55 +00:00
Matt-Yorkley
3e6445c51c Replace deprecated ActionMailer#deliver with ActionMailer#deliver_now 
DEPRECATION WARNING: `#deliver` is deprecated and will be removed in Rails 5. Use `#deliver_now` to deliver immediately or `#deliver_later` to deliver through Active Job.
 2021-01-08 20:35:47 +00:00
Matt-Yorkley
52b43d8c23 Delete dead code 
This method isn't called from anywhere
 2021-01-07 16:03:04 +00:00
Matt-Yorkley
cca16c6e1f Fix stock issue and update specs (now passing) 
See: dcd5944a29
 2021-01-06 20:13:38 +00:00
Matt-Yorkley
c0c7c4f440 Import failing specs for stock items 
See: dcd5944a29
 2021-01-06 20:12:52 +00:00
Andy Brett
51ee21e294 Merge pull request #6556 from Matt-Yorkley/adjustments-eligible 
[Adjustments] Delete dead code #eligible_for_originator?
 2021-01-01 20:48:27 -08:00
Matt-Yorkley
70f7d76723 Delete dead code #eligible_for_originator? 
This check is used only by Spree::Promotion objects, which are not used in OFN. There are no objects which can be originators of an adjustment that respond to #eligible? in this way, so the method always returns true.
 2020-12-23 08:29:12 +00:00
Andy Brett
49a2dd6211 Update product set spec to allow changing the unit_value 
These specs were introduced in cbac916e66 so we'll want to verify that we want to change them
 2020-12-22 19:46:47 -08:00
Andy Brett
fade1696e2 update variant spec based on new validation behavior 2020-12-22 19:46:47 -08:00
Pau Pérez Fabregat
9a199ae02c Merge pull request #6540 from PauloVilarinho/add-internationalization-to-payment-method-clean-name 
Add internationalization to payment method clean name
 2020-12-18 18:06:19 +01:00
Paulo Vilarinho
50955d735c Add tests for internationalization of payment method clean name 
The clean name payment method tests now uses the internationalization string
 2020-12-17 00:34:21 -03:00
Andy Brett
484576d1ac add unit test for stripe connect 2020-12-15 10:30:05 -08:00
Luis Ramos
5b00868c6f Allow mutable strings in some specs 2020-12-03 06:38:24 -08:00
Luis Ramos
bfd4adbcee Adapt code to work with frozen strings 2020-12-03 06:38:24 -08:00
Luis Ramos
2b8f0abe49 Try some mass auto-correct adding frozen-string-literal to all specs 2020-12-03 06:38:24 -08:00
Luis Ramos
7a5a4f956a Replace use of Faker with FFaker 2020-12-02 11:40:50 -08:00
Tsara Sudrajat
fb769d37f9 Fix error when setting stock for new product 2020-12-02 11:38:10 -08:00
Matt-Yorkley
60aaf8100a Fix some Rubocop offences 2020-11-27 14:00:29 +00:00
Matt-Yorkley
2b884be8dd Update specs to work with ActionMailer::DeliveryJob 2020-11-27 14:00:29 +00:00
Matt-Yorkley
aa718824d8 Fix touch spec 
The behavior in #change blocks ironically seems to have changed
 2020-11-27 14:00:29 +00:00
Matt-Yorkley
b512d3ce21 Fix column preferences spec 
Failure/Error: expect(preferences.map(&:column_name)).to eq [:col1, :col2, :col3]

        expected: [:col1, :col2, :col3]
             got: ["col1", "col2", "col3"]

        (compared using ==)

        Diff:
        @@ -1 +1 @@
        -[:col1, :col2, :col3]
        +["col1", "col2", "col3"]

      # ./spec/models/column_preference_spec.rb:56:in `block (4 levels) in <top (required)>'
 2020-11-27 14:00:29 +00:00
Matt-Yorkley
ae33df946e Fix StateMachine specs 2020-11-27 14:00:29 +00:00
Matt-Yorkley
91908a0e4c Switch from state_machine to state_machines gem 
The old version is completely unmaintained and does not work with Rails 4.2
 2020-11-27 14:00:28 +00:00
Luis Ramos
fa6cf0f281 Fix prod importer spec in rails 4.1 2020-11-27 13:59:46 +00:00