Cillian O'Ruanaidh
16b90cfc2e
Allow people to set enterprise latitude/longitude manually or automatically.
...
This for new changes to the enterprise registration/signup flow where a map will be displayed when people are filling in their address. On this map people can check the geocoder has geocoded their address correctly and if not they can manually adjust their latitude/longitude on the map.
But currently every time someone changes their address in the Admin > Enterprise > Address section the address would automatically be geocoded so this could overwrite the latitude/longitude that was set during sign up. To prevent the latitude/longitude from being overwritten this add's a checkbox which people need to explicity click if they want their address to be automatically geocoded, otherwise it will just use the manually configured latitude/longitude.
Note this new feature which allows people to select their location on a map during registration only works with Google maps so far. So if an instance is using Open Street Map this change also adds support for passing a :use_geocoder parameter to the Api::EnterprisesController during registration so that the address will be geocoded on the backend without the use of a map.
2021-04-09 12:03:12 +10:00
julesemmac
5e6ea31ad1
Improving user discover on ofn map
...
The context for this update is here: https://community.openfoodnetwork.org/t/improving-user-discovery-on-ofn-map/2013
Also with rebasing help from Maikel Linke <mkllnk@web.de >
2021-04-09 12:02:22 +10: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
jibees
ca36996060
Merge pull request #7314 from Matt-Yorkley/order-payment-amount
...
Rename #charge_shipping_and_payment_fees! to #set_payment_amount!
2021-04-08 21:22:56 +02:00
Andy Brett
67d49b7486
Merge pull request #7342 from luisramos0/dead_code
...
[Rails 5.2] Delete dead code in variants list page, this is old spree logic
2021-04-08 10:47:02 -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
034f452f4f
Merge pull request #7313 from jibees/7301-fix-line-breaks-on-cart-page
...
Add non-breaking space to avoid unwanted line breaks on unit price
2021-04-08 12:31:45 +02:00
Andy Brett
2128675e95
Merge pull request #7236 from Matt-Yorkley/exchange-deadlocks
...
Update Exchange touch on Enterprise to use #touch_later
2021-04-07 20:54:03 -07:00
Luis Ramos
ec6bb7f9fe
Delete dead code, this is old spree logic
2021-04-07 22:55:06 +01: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
Matt-Yorkley
03c36dfd7f
Remove Bugherd
...
🔥
2021-04-05 13:31:13 +01:00
Matt-Yorkley
96d8de35f2
Delete dead code Adjustment#set_included_tax!
2021-04-04 19:19:06 +01:00
Matt-Yorkley
903788903b
Remove Spree::Config[:shipping_tax_rate]
2021-04-04 19:19:06 +01:00
Matt-Yorkley
bbd4a33a87
Tax adjustments should be open when created
...
All adjustments get closed during `order.finalize!`, but before that point they should be open.
2021-04-04 19:19:06 +01:00
Matt-Yorkley
6d48471368
Update shipment totals updating
2021-04-04 19:19:06 +01:00
Matt-Yorkley
ac67f7391e
Update tax charging in checkout flow
2021-04-04 19:19:06 +01:00
Matt-Yorkley
2af0afafe9
Update Order#shipping_tax
2021-04-04 19:19:06 +01:00
Matt-Yorkley
db07a73bd7
Ensure Adjustment#update! returns an amount
2021-04-04 19:19:06 +01:00
Matt-Yorkley
7e0aad7c7e
Adapt current tax setup to work with shipment taxes
...
This is a temporary step...
2021-04-04 19:19:06 +01:00
Matt-Yorkley
7425ad5c4a
Include ItemAdjustments handling in Adjustment class
...
Currently only applies to shipments, but will later include line items, etc
2021-04-04 19:19:06 +01:00
Matt-Yorkley
25a739ea75
Remove Shipment #update_adjustment_included_tax
2021-04-04 19:19:06 +01:00
Matt-Yorkley
9bbe57afda
Extract method
2021-04-04 19:19:06 +01:00
Matt-Yorkley
89889bc280
Record tax totals in ItemAdjustments
2021-04-04 19:19:06 +01:00
Matt-Yorkley
605a94e3c9
Use Spree::ItemAdjustments in Shipment callbacks for updating adjustments
2021-04-04 19:19:06 +01:00
Matt-Yorkley
ac9ecdfcbc
Introduce Spree::ItemAdjustments class
2021-04-04 19:19:06 +01:00
Matt-Yorkley
8fccdbf92f
Introduce TaxCategories to ShippingMethods
2021-04-04 19:19:06 +01:00
Matt-Yorkley
2d647be8b4
Rename #charge_shipping_and_payment_fees! to #set_payment_amount!
...
This method sets the order's payment amount during the checkout. It doesn't really have anything to do with shipping or payment fees...
2021-04-03 16:14:38 +01:00
Jean-Baptiste Bellet
6756ffcf42
Add non-breaking space to avoid unwanted line breaks
2021-04-02 16:59:50 +02:00
Pau Pérez Fabregat
003b45d4b9
Merge pull request #7294 from Matt-Yorkley/balance-missing-methods
...
OrderBalance missing methods
2021-04-01 19:34:57 +02:00
Matt-Yorkley
f94fe452f0
Merge pull request #7191 from mkllnk/fix-deprecation-gateway-mode
...
Replace ActiveMerchant's deprecated gateway_mode
2021-04-01 13:29:10 +02:00
Matt-Yorkley
c40928d805
Merge pull request #7167 from Matt-Yorkley/adjustments-returns
...
[Adjustments] Update return adjustments
2021-03-31 21:33:45 +02:00
Matt-Yorkley
bb0cf65ecc
Handle OrderBalance comparison operators
...
These operators get used on the object returned by order_balance in a few places, and were not working correctly.
2021-03-31 13:23:13 +01:00
Matt-Yorkley
a02c505e62
Delegate #to_f and #to_d to #amount in OrderBalance
2021-03-31 13:23:13 +01:00
Matt-Yorkley
77506caca1
Rename OrderBalance methods for clarity
2021-03-31 13:09:17 +01:00
Pau Pérez Fabregat
9c468f0557
Merge pull request #7240 from Matt-Yorkley/escalating-paranoia
...
Escalating paranoia
2021-03-30 22:24:13 +02:00
Matt-Yorkley
7882c427f7
Simplify creation of negative amounts
2021-03-30 16:39:40 +01:00
Matt-Yorkley
e71f47a2e3
Use underscore in unused arguments
2021-03-30 16:39:40 +01:00
Matt-Yorkley
fcb8145a6c
Bring in changes to Adjustment#update! and CalculatedAdjustments#update_adjustment
2021-03-30 16:39:40 +01:00
Matt-Yorkley
c480d43bda
Override #compute_amount in ReturnAuthorization
...
In some cases adjustments are updated (recalculated) via their originator. In the case of return adjustments, there's no calculation (and no calculator).
2021-03-30 16:39:40 +01:00
Matt-Yorkley
3c1883dac2
Remove use of :source polymorphic association for return adjustments
2021-03-30 16:39:40 +01:00
Matt-Yorkley
8db598bff7
Simplify return adjustment creation
2021-03-30 16:39:40 +01: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
Matt-Yorkley
9c2010a43e
Update SubscriptionLineItem#variant
2021-03-29 18:41:09 +01:00
Matt-Yorkley
558457993a
Update Price#variant
2021-03-29 18:41:09 +01:00
Matt-Yorkley
2c1305b99e
Update StockItem#variant
2021-03-29 18:41:09 +01:00
Matt-Yorkley
9f4b825d46
Update InventoryUnit#variant
2021-03-29 18:41:09 +01:00
Matt-Yorkley
eccfcbc396
Update Variant#default_price
2021-03-29 18:41:09 +01:00
Matt-Yorkley
581217ea2d
Merge pull request #7239 from Matt-Yorkley/paranoia-scopes
...
Update default scopes with acts_as_paranoid
2021-03-29 15:24:44 +02: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
