raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-01-26 20:56:48 +00:00
Code Issues Packages Projects Releases Wiki Activity
20,460 Commits 18 Branches 451 Tags
fa32aecebf8aa6a1ec144fcbcc4f2484a276ffaa
Commit Graph

1680 Commits

Author SHA1 Message Date
Pau Pérez Fabregat
cf2e3db645 Merge pull request #7445 from jibees/7403-add-customer-name-into-subscriptions-table 
Add customer name into subscriptions list in order to search subscription by customer name
 2021-04-22 19:46:49 +02:00
Jean-Baptiste Bellet
05a00a07ef Add test on order creation and correct display of the error 
- The error "Line items can't be blank" should not be displayed when we first arrived on this page after creation but only if we update the page
 2021-04-22 10:03:43 +02:00
Jean-Baptiste Bellet
da5f1b0b38 Update test for subscriptions search by email and name 
- We now display the name of the customer so we can search by its name: add specs about search by email/name
 2021-04-21 09:44:30 +02:00
Pau Pérez Fabregat
87624f4c9f Merge pull request #7416 from coopdevs/remove-old-balance-implementation 
Remove old balance implementation
 2021-04-20 08:51:27 +02:00
Andy Brett
aca19edd3b Merge pull request #7421 from andrewpbrett/rails-5-2-prep-2 
Prepare for Rails 5.2
 2021-04-19 11:32:21 -07:00
Pau Perez
5bca7d1f8f Remove the old balance's code branch 
This keeps the `OrderBalance` abstraction but removes the old code now
that the feature is enabled for all users in all instances and there are
no bugs reported. It's become dead code.
 2021-04-19 11:52:41 +02:00
Andy Brett
4aa2ce4b58 Merge pull request #7362 from richardc2117/master 
Fixes Alphabetical Sorting In Packing Reports
 2021-04-15 09:50:02 -07:00
Pau Pérez Fabregat
5ddccc79ae Merge pull request #7404 from jibees/7180-variant-unit-scale-field-invalid-when-editing-a-product 
Fix Variant Unit Scale field initialization in Edit Product form
 2021-04-15 18:20:31 +02:00
Matt-Yorkley
fa14a80295 Adapt order payment creation in failing specs 
In the test setups here order.payments is empty
 2021-04-14 09:22:31 -07:00
Jean-Baptiste Bellet
8a3eea7a27 Enable tests 
Thanks to @filipefurtad0 you now have tests ready before fixing anything : 👍 🙏
 2021-04-14 16:17:17 +02:00
Matt-Yorkley
15edb5b13b Remove more uses of adjustment source association in tests 2021-04-14 12:01:21 +01:00
Andy Brett
a3ac7a7ffd Merge pull request #7354 from andrewpbrett/uncomment-tag-rule-spec 
Uncomment out flaky tag rules spec
 2021-04-12 08:17:14 -07:00
ricchen
8c391251b3 added test case for alphabetically sorting 2021-04-08 23:57:33 -04:00
Andy Brett
199efb1e20 Merge pull request #7351 from Matt-Yorkley/dead-code-discount-order 
Dead code: DiscountOrder
 2021-04-08 12:48:38 -07:00
Andy Brett
48f2ab7ad7 Revert "comment out flaky spec" 
This reverts commit fc4634cd67.
 2021-04-08 11:07:30 -07:00
Andy Brett
b78ed85ad3 Merge pull request #7321 from Matt-Yorkley/remove-bugherd 
Remove Bugherd
 2021-04-08 10:35:17 -07:00
Matt-Yorkley
80d43c714d Remove TagRule::DiscountOrder 
This class was removed from the UI in 2016 and hasn't been used since...
 2021-04-08 12:37:17 +01:00
Matt-Yorkley
e61fe86d00 Merge pull request #7300 from andrewpbrett/on-demand-max-quantities 
Allow any quantity if variant is set to on demand
 2021-04-08 12:33:19 +02:00
Matt-Yorkley
1ce3103aa7 Merge pull request #6924 from Matt-Yorkley/adjustments-shipping-tax 
[Adjustments] Shipping tax
 2021-04-07 00:21:12 +02:00
Matt-Yorkley
01e6397e27 Remove Spree::Config[:shipment_inc_vat] 
This is now done per ShippingMethod instead of globally
 2021-04-06 20:29:58 +01:00
Andy Brett
2aeed30775 Merge pull request #7265 from andrewpbrett/freeze-adjustments 
Don't allow edits to adjustments for canceled orders
 2021-04-06 10:56:27 -07:00
Matt-Yorkley
03c36dfd7f Remove Bugherd 
🔥
 2021-04-05 13:31:13 +01:00
Matt-Yorkley
903788903b Remove Spree::Config[:shipping_tax_rate] 2021-04-04 19:19:06 +01:00
Matt-Yorkley
a26880a3a1 Update shipment tax fetching in Xero Invoices report 2021-04-04 19:19:06 +01:00
Matt-Yorkley
1f897b1e44 Update sales tax report spec 2021-04-04 19:19:06 +01:00
Andy Brett
c0cbd1e688 remove new adjustment button for canceled orders 2021-04-02 12:26:59 -07:00
Jean-Baptiste Bellet
abd2d3f46f Add tests around unit price in backoffice 
3 cases:
 - creating a new product
 - creating a new variant
 - editing an existing variant
 2021-04-02 15:22:01 +02:00
Matt-Yorkley
2292deebe6 Merge pull request #7232 from mkllnk/7231-timeout 
Keep status bar with message without auto-close
 2021-04-01 13:23:12 +02:00
Andy Brett
9f0f88de4e allow any quantity if variant is set to on demand 2021-03-31 22:02:32 -07:00
Pau Pérez Fabregat
958023d6da Merge pull request #7183 from filipefurtad0/variant_unit_scale_spec 
Covers unit variant changes; adds test to #7180
 2021-03-31 11:21:49 +02:00
Matt-Yorkley
3f14694b2b Merge pull request #6960 from andrewpbrett/namespace-api 
Namespace existing API endpoints to api/v0/*
 2021-03-30 19:45:27 +02:00
Pau Pérez Fabregat
7d5726b6c7 Merge pull request #7150 from coopdevs/use-order-balance-object 
Feature-toggle all remaining parts of the app where the order balance is shown
 2021-03-30 15:58:12 +02:00
Andy Brett
32c0f6777a don't allow edits to adjustments for canceled orders 2021-03-29 14:27:46 -07:00
filipefurtad0
9092b60229 turns testcases into shared examples 2021-03-29 20:00:04 +01:00
Matt-Yorkley
e8ddbc0449 Merge pull request #7228 from andrewpbrett/freeze-canceled-orders 
Remove UI for modifying line items on canceled orders
 2021-03-29 15:24:24 +02:00
Maikel Linke
02703053bc Keep status bar with message without auto-close 
The message would disappear after five seconds which can be confusing
for the user (they may miss an important message) and makes our specs
flaky.
 2021-03-29 11:12:40 +11:00
Maikel
74b06d16b8 Merge pull request #7209 from openfoodfoundation/dependabot/bundler/rubocop-1.12.0 
Bump rubocop from 1.11.0 to 1.12.0
 2021-03-29 10:59:38 +11:00
Andy Brett
5a19a14042 rename to v0 2021-03-27 11:21:18 -07:00
Andy Brett
563a2758a6 remove UI for modifying line items on canceled orders 2021-03-25 16:52:56 -07:00
Maikel Linke
ffb4ba5ef5 Style numeric predicate use with Rubocop 2021-03-25 18:07:11 +11:00
Matt-Yorkley
0ab43d23f9 Replace deprecated reloading by passing true to an association 
object.relation(true) -> object.relation.reload
 2021-03-24 17:51:22 +00:00
filipefurtad0
36ab3825e9 covers unit variant changes; adds test to #7180 2021-03-23 15:30:15 +00:00
Pau Perez
c7b85a3591 Sum balances in Payments report implementing #+ 
This avoids consumers of `OrderBalance` having to couple with the inner
details of this abstraction, which makes the code more changeable.
 2021-03-23 09:28:40 +01:00
Pau Perez
f494b720f8 Fix spec 2021-03-22 11:45:12 +01:00
Pau Perez
5815d1a4a4 Make #outstanding_balance return an OrderBalance 
This will let us branch by abstraction. All existing calls to
`#outstanding_balance` will go through `OrderBalance` hence, will
check the feature toggle.

Note that by default, `OrderBalance` will end up calling
`#old_outstanding_balance`. As the name states, that's exactly what
`#outstanding_balance` was so far. This means no consumers will see any
change in behavior. We just added on item in the call stack (sort of).
 2021-03-22 11:45:12 +01:00
Andy Brett
046a2077f2 check the time, not the printed zone, in the spec 2021-03-16 12:14:27 -07:00
Andy Brett
76940a6a2e Merge pull request #7134 from coopdevs/feature-test-payments-report 
Feature-test payments report
 2021-03-16 10:18:36 -07:00
Pau Perez
16647006c6 Feature-test payments report 
This report displays order balances and we'll need this basic
feature-test coverage to ensure it keeps working once we refactor them.
 2021-03-16 17:05:31 +01:00
Andy Brett
b0f2688001 Merge pull request #7128 from jibees/7127-terms-&-conditions-test-fails 
Use timezone as hour and minute offset from UTC in terms_and_conditions_spec.rb
 2021-03-16 08:34:18 -07:00
Matt-Yorkley
e78fb784c6 Merge pull request #7042 from coopdevs/fix-money-object-deprecation-warnings 
Fix money object deprecation warnings
 2021-03-16 14:30:51 +01:00