Matt-Yorkley
1afcd70510
Simplify Order#total_tax
2021-03-04 14:27:02 +00:00
Matt-Yorkley
ff58e2da54
Use AR syntax in queries
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
833aae23e5
Update admin adjustments controller
2021-03-04 14:27:02 +00:00
Matt-Yorkley
045cdec23c
Update OrderDetailedSerializer
2021-03-04 14:27:02 +00:00
Matt-Yorkley
80aefa8e73
Update OrderTaxAdjustmentsFetcher
2021-03-04 14:27:02 +00:00
Matt-Yorkley
02fb2c6a55
Update CheckoutHelper
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
Pau Pérez Fabregat
d856e006ec
Merge pull request #6989 from andrewpbrett/fix-group-map-icons
...
Update path to +1 map icon
2021-03-04 11:31:17 +01:00
Andy Brett
5966557b59
update path to +1 map icon
2021-03-02 08:53:13 -08: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
Pau Pérez Fabregat
a0aeb1ceb4
Merge pull request #6889 from mkllnk/6102-footer
...
Emphasise ways to get help in user emails
2021-03-01 09:59:18 +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
855e38cd73
add I18n
2021-02-26 07:47:58 -08:00
Pau Perez
c3179b4304
Restore table's top rounded corners
2021-02-26 07:44:09 -08:00
Pau Perez
2146ed277f
Fix table header spacing when status is hidden
2021-02-26 07:44:09 -08:00
Pau Perez
ad147ed8f5
Make payment auth table as wide as table below
...
This makes this page look a bit more consistent. Note I also had to fix
the price in the value column.
To do this I pulled out the width property from `.orders` which defines
too many things. This way we can make the auth table full-width while
not being tied to all the other properties which are not needed in this
table. Then, `.orders`'s nested `.order1, .order2` etc. column class
become useless.
2021-02-26 07:44:09 -08:00
Pau Perez
cbb919f28b
Left-align table with table below
2021-02-26 07:44:09 -08:00
Pau Perez
8696882549
Refactor payment auth button to fit into table row
...
This looks a bit more cohesive with the rest of the row cells while
still standing out from the rest.
2021-02-26 07:44:08 -08:00
Andy Brett
c23fb27031
remove unnecessary join
2021-02-26 07:44:08 -08:00
Andy Brett
7bb49b51fd
use scope on payment model
2021-02-26 07:44:08 -08:00
Andy Brett
e5eb8f97f9
add basic feature spec for authorisation table
2021-02-26 07:44:08 -08:00
Andy Brett
0b245ad7b1
make user attr private
2021-02-26 07:44:08 -08:00
Andy Brett
ee351d91a9
show authorization links in separate table
2021-02-26 07:44:08 -08:00
Pau Pérez Fabregat
5ded4ed938
Merge pull request #6958 from Matt-Yorkley/remove-weird-file
...
Remove dead file
2021-02-25 15:56:04 +01:00
Matt-Yorkley
d92de62a0b
I guess this was committed by mistake
2021-02-25 12:56:07 +00:00
Pau Pérez Fabregat
404ec7bf92
Merge pull request #6950 from andrewpbrett/fix-nil-enterprise-category
...
Fix #6949 : Add default icon value if enterprise.category is nil
2021-02-25 13:20:10 +01:00
Andy Brett
bc7477795c
Merge pull request #6910 from andrewpbrett/remove-order-capture
...
Make orders not capturable if they have a payment pending authorization
2021-02-24 12:20:43 -08:00
Pau Pérez Fabregat
d7d86729ad
Merge pull request #6929 from efgalvao/issue#6892
...
Fix the issue #6892
2021-02-24 20:48:27 +01:00
Pau Pérez Fabregat
15e6c28cc5
Merge pull request #6954 from coopdevs/remove-dead-serializer
...
Remove dead serializer
2021-02-24 18:01:29 +01:00
Matt-Yorkley
0f0f3e1ab4
Merge pull request #6940 from drummer83/patch-1
...
Create independent title string for 'Map' page
2021-02-24 17:24:25 +01:00
Pau Perez
ec3b402856
Remove dead serializer
...
This became unused in
b9d72ce4cf (diff-5df9d1d16b9e9ac1724af5c6180ca86f7caeb6a4880d2f77ac25fbe757b597b9)
2021-02-24 17:09:16 +01:00
Pau Pérez Fabregat
0e03864aa9
Merge pull request #6906 from jibees/6895-close-tooptip-when-user-clicks-anywhere-else
...
Close unit price tooltip when user click outside the tooltip
2021-02-24 15:19:25 +01: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
Andy Brett
2d304bd997
add default icon value if enterprise.category is nil
2021-02-23 11:37:36 -08:00
Pau Perez
116109c63d
Make /api/orders N+1 free
...
With the help of the bullet gem, and since we remove a couple of N+1s
already, remove them all was just a few keystrokes away. This commits
gets us from 42 SQL queries to 17, and 364.5ms to 253.9ms on my machine
where I just have the sample data's orders. As usual, this will have
a much bigger impact in scenarios with more data.
2021-02-23 10:26:12 -08:00
Pau Perez
20a7f2f24e
Eager load payment and subs. order associations
...
This removes the N+1 queries caused by
`Api::Admin::OrderSerialier#ready_to_capture` when used from
`Api::OrdersController#index`. While it's fine for the single-order
controller actions, it's not for this one that deals with a collection
of orders.
Fortunately, `SearchOrders` is used only in this controller action so we
can put the `includes` calls there, otherwise, we would need to refactor
it a bit to pass in a context-specific AR relation.
2021-02-23 10:26:12 -08:00
Andy Brett
d62a984939
make orders not capturable if they have a payment pending authorization
2021-02-23 10:26:04 -08: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 Linke
b61ce13a1b
Add missing helper to UserMailer
2021-02-23 11:24:55 +11:00
