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
365700615a
Remove dead code: Spree::Config.auto_capture
...
We set this value to `true` unconditionally in an initializer, and then check the value in various places via Spree::Config. It's never false, and it's not configurable, so we can just drop it and remove the related conditionals. 🔥
2021-03-05 16:03:07 +00:00
Matt-Yorkley
a670771037
Reduce duplicate updates in Payment#revoke_adjustment_eligibility
...
This was triggering two separate updates, and each of those updates could trigger callbacks, and those could trigger other callbacks. Here we're doing the same thing, but with one update.
2021-03-05 15:12:41 +00:00
Andy Brett
a431c03eb1
only show primary producers on shopfront list of producers
2021-03-04 14:32:55 -08:00
Andy Brett
4e5945f9ef
add resumed to list of allowable order states
2021-03-04 11:24:39 -08:00
Pau Pérez Fabregat
674f0f87a3
Merge pull request #6528 from mprieger/5546-cart-page-last-item-deletion
...
Fix users removing last item of confirmed order on /cart page
2021-03-04 17:27:51 +01:00
Pau Pérez Fabregat
982c3d2215
Merge pull request #6965 from andrewpbrett/fix-sca-snail
...
Fix #6964 : don't try to complete a failed payment
2021-03-04 17:26:24 +01:00
Pau Pérez Fabregat
ff239802b6
Merge pull request #6982 from andrewpbrett/canceled-order-payments
...
Fix #5018 : Allow access to payments tab for canceled orders
2021-03-04 17:25:30 +01:00
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
Konrad
748b2b8223
Removed #secure and replaced with class
2021-03-03 20:59:30 +01:00
Konrad
db6eaede14
Shortened long line
2021-03-03 20:58:45 +01:00
Konrad
aa761d6d67
Removed #secure and replaced with class
2021-03-03 20:57:55 +01:00
Konrad
07b23602cd
Included #secure and method show_social_icons?
2021-03-03 20:38:12 +01:00
Konrad
e0108431d9
Added method to check for social icons
2021-03-03 20:36:22 +01:00
Konrad
553954f8bf
Removed "footer .row a" and added "#secure"
2021-03-03 20:35:16 +01:00
Pau Perez
21fb3f3da6
Extract orders relation as a query object
2021-03-03 18:21:10 +01:00
Pau Perez
3b7f45516c
Toggle bulk coop report balance calculation
...
This will make users hit the new method that implements the new
calculation we are aiming for, only if they have the feature enabled.
2021-03-03 18:19:26 +01:00
Pau Perez
cd60cea5de
Extract balance-related methods into module
...
This model concerns helps us put together this related methods. Although
it doesn't provide any encapsulation yet, it makes a bit easier to
consider them all next time we need to change this implementation
somehow. It's a bit of an illusion but it feels like we are making this
God object model a bit smaller.
It also gives more room for documentation that will aid future devs.
2021-03-03 18:19:26 +01:00
Pau Perez
d1fde07535
Extend #outstanding_balance to mimic OustandingBalance
2021-03-03 18:19:26 +01:00
Pau Perez
a3b2a25ccf
Refactor and reuse :not_state scope
2021-03-03 18:19:26 +01: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
Andy Brett
5966557b59
update path to +1 map icon
2021-03-02 08:53:13 -08:00
Andy Brett
ad8973d74b
add messages object to order controller
2021-03-01 21:01:34 -08:00
Andy Brett
72b7fe723f
fix indentation
2021-03-01 20:42:05 -08:00
Andy Brett
5751e247bd
Update app/assets/javascripts/darkswarm/controllers/edit_bought_order_controller.js.coffee
2021-03-01 20:42:05 -08:00
Andy Brett
3725ba0fc4
Update app/assets/javascripts/darkswarm/services/cart.js.coffee
2021-03-01 20:42:05 -08:00
Matthew Rieger
651bdad7b9
Fix users removing last item of confirmed order on /cart page
2021-03-01 20:42:05 -08:00
Andy Brett
a02065b66f
allow access to payments tab for canceled orders
2021-03-01 19:51:50 -08:00
Andy Brett
3b15e0ee15
only complete the payment if it is in a completable state
2021-03-01 18:51:14 -08:00
Konrad
3d8cfc4ccd
Updated footer for clean footer
...
Updated the footer to have precise alignment of elements and consistent font sizes throughout the front-end footer.
2021-03-01 20:47:36 +01:00
Konrad
799d35f187
Updated stylesheets for clean footer
...
Updated the stylesheets to have precise alignment fo elements and consistent font sizes throughout the front-end footer.
2021-03-01 20:44:22 +01:00
Jean-Baptiste Bellet
d6cf69df34
Fix vertical alignment using flex
...
- Firefox displayed the icon above the legend
- Use `display: flex;` and `align-items: center;` to vertical align icon and text
2021-03-01 16:40:02 +01:00
