Matt-Yorkley
d72cf18ec4
Merge pull request #7356 from andrewpbrett/fix-shipment-controller-spec
...
Fix failing shipments controller spec
2021-04-08 18:30:29 +02: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
704ed128cf
Merge pull request #7338 from gucci-ninja/7306-remove-arrows-from-number-input
...
Remove arrows on number input when adding items
2021-04-08 16:10:02 +02:00
Pau Pérez Fabregat
478c310d4a
Merge pull request #7325 from Matt-Yorkley/wkhtmltopdf
...
Remove wkhtmltopdf-binary version pin and bump gem
2021-04-08 15:23:59 +02: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
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
Pau Pérez Fabregat
b00828cc46
Merge pull request #7311 from Matt-Yorkley/codecov-whitelisting
...
Exclude /lib/tasks/sample_data from CodeCov
2021-04-08 09:59:56 +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
Pau Pérez Fabregat
cd253c625e
Merge pull request #7317 from openfoodfoundation/transifex
...
Transifex
2021-04-08 09:42:11 +02:00
Transifex-Openfoodnetwork
26cf569f41
Updating translations for config/locales/es.yml
2021-04-08 17:18:54 +10:00
Transifex-Openfoodnetwork
0bd2f09c6f
Updating translations for config/locales/es.yml
2021-04-08 17:15:47 +10:00
Transifex-Openfoodnetwork
eb0cb6fe86
Updating translations for config/locales/es.yml
2021-04-08 17:12:38 +10:00
Transifex-Openfoodnetwork
629b289f84
Updating translations for config/locales/ca.yml
2021-04-08 17:07:19 +10:00
Transifex-Openfoodnetwork
20e22de40c
Updating translations for config/locales/en_FR.yml
2021-04-08 17:01:50 +10:00
Transifex-Openfoodnetwork
f241620682
Updating translations for config/locales/fr.yml
2021-04-08 17:01:40 +10: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
b83340ac45
Merge pull request #7287 from mkllnk/7166-cancelled-stock
...
Disallow changes of canceled order
2021-04-08 11:28:35 +10:00
Maikel Linke
42543bfaf7
Add flash when order cannot be changed
2021-04-08 09:24:39 +10: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
gucci-ninja
d70c2b99fd
Remove arrows on number input when adding items
2021-04-07 14:32:29 -04:00
Matt-Yorkley
52c7abf1c0
Merge pull request #7334 from Matt-Yorkley/payment-reports-error
...
Fix outstanding balance sum in payment report
2021-04-07 13:47:45 +02:00
Matt-Yorkley
05b8b8e9db
Fix outstanding balance sum in payment report
2021-04-07 10:56:20 +01:00
Transifex-Openfoodnetwork
5e99294f79
Updating translations for config/locales/en_GB.yml
2021-04-07 08:33:57 +10:00
Transifex-Openfoodnetwork
0888658431
Updating translations for config/locales/fr.yml
2021-04-07 08:33:53 +10:00
Transifex-Openfoodnetwork
85cc9be07b
Updating translations for config/locales/en_GB.yml
2021-04-07 08:30:57 +10:00
Transifex-Openfoodnetwork
b34c2d3b9f
Updating translations for config/locales/ru.yml
2021-04-07 08:30:52 +10:00
Transifex-Openfoodnetwork
837130bebe
Updating translations for config/locales/it.yml
2021-04-07 08:30:49 +10:00
Transifex-Openfoodnetwork
480dc3d4b8
Updating translations for config/locales/fr.yml
2021-04-07 08:30:45 +10: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
Transifex-Openfoodnetwork
27ac53aabc
Updating translations for config/locales/it.yml
2021-04-07 05:33:40 +10:00
Transifex-Openfoodnetwork
ffc9da9972
Updating translations for config/locales/en_IE.yml
2021-04-07 05:33:35 +10:00
Transifex-Openfoodnetwork
1fa7035c2f
Updating translations for config/locales/it.yml
2021-04-07 05:30:33 +10:00
Transifex-Openfoodnetwork
cedbfbc8ea
Updating translations for config/locales/en_IE.yml
2021-04-07 05:30:29 +10:00
Transifex-Openfoodnetwork
3e26ccabeb
Updating translations for config/locales/ru.yml
2021-04-07 05:30:26 +10:00
Matt-Yorkley
4a65e5817f
Add fieldset title to shipping methods edit form
2021-04-06 20:30:07 +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
