Matt-Yorkley
4ff56ce625
Update deprecated use of #uniq in OrderCyle scopes
2021-03-11 12:19:55 +00:00
Matt-Yorkley
90712647b1
Update totals when processing a return
2021-03-11 11:20:01 +00:00
Matt-Yorkley
4c64aaed77
Remove callbacks in Adjustment that call order.update!
2021-03-11 11:20:01 +00:00
Matt-Yorkley
791a47d170
Merge pull request #6858 from Matt-Yorkley/adjustments-shipping-cost
...
[Adjustments] Move shipping adjustment from order to shipment
2021-03-11 12:17:14 +01:00
Pau Pérez Fabregat
e341b04487
Merge pull request #6902 from openfoodfoundation/setup-postgres-gh-actions
...
Setup Github Actions as CI
2021-03-10 16:59:59 +01:00
Andy Brett
05a074d33a
Merge pull request #7041 from Matt-Yorkley/adjustments-set-eligibility
...
[Adjustments] Remove Adjustment#set_eligibility
2021-03-09 13:33:21 -08:00
Andy Brett
bc7469c7aa
fix order test
2021-03-09 16:22:46 +01:00
Pau Pérez Fabregat
6b111561e8
Merge pull request #7000 from Matt-Yorkley/dead-code-tax-total
...
DCOTW: Order#tax_total
2021-03-08 16:57:59 +01:00
Matt-Yorkley
c99a9f4ee1
Remove Adjustment#set_eligibility
2021-03-08 15:29:04 +00:00
Pau Pérez Fabregat
876c378e4f
Merge pull request #7028 from Matt-Yorkley/dead-code-available-shipment
...
DCOTW: Order#has_available_shipment
2021-03-08 15:25:39 +01:00
Matt-Yorkley
af29c67ea5
Update Order#ship_total
2021-03-06 14:14:56 +00:00
Matt-Yorkley
f894473e03
Delete dead code: Order#item_count
2021-03-06 00:04:46 +00:00
Matt-Yorkley
68e752ef32
Delete dead code: Order#has_available_shipment
2021-03-05 23:42:08 +00:00
Matt-Yorkley
1afcd70510
Simplify Order#total_tax
2021-03-04 14:27:02 +00:00
Matt-Yorkley
945605e3a8
Rename Shipment #adjustment to #fee_adjustment for clarity
2021-03-04 14:27:02 +00:00
Matt-Yorkley
f956aca82f
Use shipping fee adjustment as single source of truth, and persist it on the shipment :cost field when it changes.
2021-03-04 14:27:02 +00:00
Matt-Yorkley
aa16c64f20
Update Order#finalize! to include all adjustments
2021-03-04 14:27:02 +00:00
Matt-Yorkley
c0b33de0f0
Move #adjustment_label to shipment
2021-03-04 14:27:02 +00:00
Matt-Yorkley
f0aa43e198
Update Order shipment adjustments fetching
2021-03-04 14:27:01 +00:00
Matt-Yorkley
f5d3e22730
Add shipment_adjustments association to Order
2021-03-04 14:27:01 +00:00
Matt-Yorkley
4c57addb02
Move shipping fee adjustment from the order to the shipment
2021-03-04 14:27:01 +00:00
Matt-Yorkley
551cb9a2d2
Remove Shipment#cost method
...
Cost is now recorded on the shipment record itself
2021-03-04 14:27:01 +00:00
Matt-Yorkley
81cdc2eac1
Bring in Shipment#update_amounts method
2021-03-04 14:27:01 +00:00
Matt-Yorkley
2a0f132b8b
Improve ShippingMethod -> Shipment association
...
5a54a0b6b0
2021-03-04 14:27:01 +00:00
Matt-Yorkley
d17ff38a7e
Delete Order#tax_total
...
#display_tax_total is not used anywhere, #tax_total is used in once place but it's not needed.
2021-03-03 11:26:32 +00:00
Pau Pérez Fabregat
7f4849da25
Merge pull request #6971 from Matt-Yorkley/dead-code-assassin
...
Remove dead code Order#display_ship_total
2021-03-01 10:07:30 +01:00
Pau Pérez Fabregat
8d31ba2677
Merge pull request #6966 from Matt-Yorkley/dead-code-totals
...
Dead code of the week
2021-03-01 10:05:31 +01:00
Matt-Yorkley
4c3ff402e6
Remove dead code Order#display_ship_total
2021-02-28 13:49:38 +00:00
Matt-Yorkley
16eff698df
Remove dead code; Spree::Order #line_item_adjustment_totals and #price_adjustment_totals
2021-02-27 11:56:44 +00:00
Andy Brett
7bb49b51fd
use scope on payment model
2021-02-26 07:44:08 -08:00
Pau Pérez Fabregat
d513dc31de
Merge pull request #6905 from jibees/6498-show-unit-price-in-checkout
...
Show unit price in checkout process (both cart page and cart sidebar)
2021-02-24 11:59:25 +01:00
Matt-Yorkley
9852470ef6
Merge pull request #6913 from Matt-Yorkley/rails-5-backports
...
Rails 5 backports
2021-02-23 11:55:31 +01:00
Maikel
3e0547f563
Merge pull request #6926 from andrewpbrett/check-nan
...
Ensure unit_value is a number
2021-02-23 10:40:00 +11:00
Matt-Yorkley
0e3429dc35
Merge pull request #6758 from Matt-Yorkley/enterprise-fees-refactor
...
Enterprise fees refactor
2021-02-22 17:59:18 +01:00
Andy Brett
5dcda317d2
add bugsnag alert
2021-02-21 22:27:58 -08:00
Andy Brett
e06843c445
ensure unit_value is a number
2021-02-19 14:38:08 -08:00
Jean-Baptiste Bellet
ee4943f6e2
Display unit price on /cart page
...
- Use a new class to specify css customization
- Add to `line_item.rb` a fake method: `unit_price_price_and_unit` @andrewpbrett will change it with real values.
- Add a new variable: $text-xs to specify small font-size
squash "Display unit price on /cart page"
2021-02-18 15:02:30 +01:00
Matt-Yorkley
219c982db7
Re-implement pre-Rails-5 versions of #implement! and #decrement! on Spree::LineItem
...
Rails 5 introduced some breaking changes to these built-in methods, and the new versions no longer work correctly in relation to decrementing stock with VariantOverrides.
2021-02-18 12:28:24 +00:00
Matt-Yorkley
18a354ec1e
Fix private method called
...
```
Failure/Error: variant.stock_items.first.update_attribute(:count_on_hand, 10)
NoMethodError:
private method `count_on_hand=' called for #<Spree::StockItem:0x00005573998948a8>
Did you mean? count_on_hand
count_on_hand?
count_on_hand_was
# ./spec/models/spree/variant_spec.rb:249:in `block (5 levels) in <module:Spree>'
# -e:1:in `<main>'
```
2021-02-18 12:20:29 +00:00
Matt-Yorkley
42a5d7cdc7
Delete dead code Variant#set_option_value
2021-02-17 14:27:51 +00:00
Matt-Yorkley
105f59d959
Delete dead code Variant#default_price?
2021-02-17 14:27:51 +00:00
Matt-Yorkley
4213f66afb
Delete dead code Variant#name_and_sku
2021-02-17 14:27:51 +00:00
Matt-Yorkley
d06fee026c
Delete dead code Variant#on_backorder
2021-02-17 14:27:51 +00:00
Matt-Yorkley
81ac2c5add
Delete code related to :cost_price field
2021-02-17 14:27:51 +00:00
Andy Brett
0a7396eb1c
Merge pull request #6713 from andrewpbrett/sca-subs-emails
...
Send emails when subscription payments require SCA auth
2021-02-12 08:23:32 -08:00
Pau Pérez Fabregat
34ce3c0db1
Merge branch 'master' into remove_pin
2021-02-11 11:19:18 +01:00
Andy Brett
9104ca72a9
refactor to descriptive method authorization_action_required?
2021-02-10 09:36:35 -08:00
Pau Pérez Fabregat
ed1c1e5607
Merge pull request #6823 from Matt-Yorkley/dead-code-shipment
...
Dead code: Shipment#total_cost
2021-02-08 13:44:14 +01:00
Maikel
173cf9e536
Merge pull request #6565 from Matt-Yorkley/adjustments-inclusive
...
[Adjustments] Improve inclusive/additional tax recording
2021-02-08 09:38:31 +11:00
Matt-Yorkley
14530ddbc5
Remove dead code: Shipment#total_cost
2021-02-07 13:41:44 +00:00
