Cillian O'Ruanaidh
8a4e7d70a9
Pass in owner_id parameter correctly so admin/enterprises#create controller spec doesn't fail
2021-04-09 12:04:31 +10:00
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
Matt-Yorkley
d1755acac5
Merge pull request #7355 from andrewpbrett/rspec-syntax
...
Update rspec syntax
2021-04-08 20:01:48 +02:00
Andy Brett
b78ed85ad3
Merge pull request #7321 from Matt-Yorkley/remove-bugherd
...
Remove Bugherd
2021-04-08 10:35:17 -07:00
Luis Ramos
706b854d8c
Fix rspec syntax
2021-04-08 10:03:11 -07:00
Andy Brett
c3c482c0fe
fix failing spec
...
Another PR introduced a before_action to the controller, so we have to stub that out to avoid the double receiving an unexpected message
2021-04-08 08:53:35 -07:00
Andy Brett
9b3628a4dd
Merge pull request #7299 from andrewpbrett/line-item-fees
...
Update fees after changing a line item
2021-04-08 07:26:34 -07:00
Matt-Yorkley
e1a10db410
Remove :tag_rule factory and update tests to use alternate (valid) factories
2021-04-08 12:37:45 +01:00
Matt-Yorkley
9a4bbacbaa
Update enterprises controller spec to use different (valid) TagRule class
2021-04-08 12:37:19 +01: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
Pau Pérez Fabregat
682cdc4ece
Merge pull request #7349 from andrewpbrett/fix-unit-price-nil-method
...
Guard against variants that use items but have scales
2021-04-08 09:56:48 +02:00
Pau Pérez Fabregat
953454e2fb
Merge pull request #7343 from luisramos0/dead_code_2
...
[Rails 5.2] Remove dead code
2021-04-08 09:48:25 +02:00
Pau Pérez Fabregat
27ac17f95e
Merge pull request #7344 from luisramos0/helpers
...
[Rails 5.2] Fix base helper spec in rails 52
2021-04-08 09:47:49 +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
Andy Brett
a60b4a41c5
guard against variants that use items but have scales
2021-04-07 18:31:15 -07:00
Maikel Linke
cf22a864f3
Fix typo in spec description
2021-04-08 09:24:39 +10:00
Maikel Linke
bfa5d443f1
Don't change canceled orders
...
We have a PR already that removes the UI for this when the order is
canceled. Implementing it on controller-side makes sure that it doesn't
happen accidentally if the user has multiple tabs open.
2021-04-08 09:24:39 +10:00
Maikel Linke
f0d5bf0ab5
Disallow changes of canceled order
2021-04-08 09:24:39 +10:00
Maikel Linke
f2a2cbd3f9
Spec stock bug when changing canceled orders
...
We decided to disallow changing canceled orders in a way that would
affect stock or totals.
2021-04-08 09:24:39 +10:00
Maikel Linke
8079fb0315
Add specs for stock changes
2021-04-08 09:24:39 +10:00
Maikel Linke
e1d22aec83
Prepare for more shipment specs with different context
...
This commit is best viewed ignoring whitespaces.
2021-04-08 09:24:39 +10:00
Maikel Linke
c5e72f8563
Test shipment changes more precisely
2021-04-08 09:24:39 +10:00
Maikel Linke
65b37b249d
Prepare spec code for re-use
2021-04-08 09:24:39 +10:00
Maikel Linke
d571bc731b
Style spec with rubocop -a
2021-04-08 09:24:39 +10:00
Luis Ramos
026c0640c4
Remove dead code
2021-04-07 23:31:43 +01:00
Luis Ramos
c33cf67ec7
Fix base helper spec in rails 52
2021-04-07 23:25:14 +01: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
a2f6ff7b39
Update deprecated params in checkout spec
2021-04-04 19:19:06 +01:00
Matt-Yorkley
76cf239623
Sort ids in test in case ordering is reversed
2021-04-04 19:19:06 +01:00
Matt-Yorkley
595389cbea
Update stripe spec
...
The hard-coded order total here was incorrect. It's now correctly including the $3 shipping fee used with that order factory, and the total is actually $13.
2021-04-04 19:19:06 +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
a26880a3a1
Update shipment tax fetching in Xero Invoices report
2021-04-04 19:19:06 +01:00
Matt-Yorkley
3c602cad97
Add unit tests for migration
2021-04-04 19:19:06 +01:00
Matt-Yorkley
63483818d7
Remove dead code
...
This spec is doing nothing...
2021-04-04 19:19:06 +01:00
Matt-Yorkley
56a01194cd
Update shipping tax adjustments specs
2021-04-04 19:19:06 +01:00
Matt-Yorkley
e81270d0d7
Fix adjustment test setups missing order associations
...
All adjustments must be associated with an order
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
2ab9602ad7
Increase tested details in Order spec
2021-04-04 19:19:06 +01:00
Matt-Yorkley
93771aeb94
Update orders spec
2021-04-04 19:19:06 +01:00
Matt-Yorkley
2f19428b40
Update orders controller
2021-04-04 19:19:06 +01:00
Matt-Yorkley
1f897b1e44
Update sales tax report spec
2021-04-04 19:19:06 +01:00
Matt-Yorkley
889b357408
Update Order#total_tax
2021-04-04 19:19:06 +01:00
