Matt-Yorkley
c47902d932
Fix params in Admin::EnterprisesController#register
2021-02-18 15:04:09 +00:00
Matt-Yorkley
84f56b2b44
Fix relation/array handling in OrderCycles List
2021-02-18 14:59:38 +00:00
Matt-Yorkley
aebd785a54
Fix persistence issue in view test setup
2021-02-18 14:58:25 +00:00
Jean-Baptiste Bellet
dd0ef0d599
Display unit price info if feature is enabled
2021-02-18 15:05:40 +01:00
Jean-Baptiste Bellet
ee4943f6e2
Display unit price on /cart page
...
- Use a new class to specify css customization
- Add to `line_item.rb` a fake method: `unit_price_price_and_unit` @andrewpbrett will change it with real values.
- Add a new variable: $text-xs to specify small font-size
squash "Display unit price on /cart page"
2021-02-18 15:02:30 +01:00
Jean-Baptiste Bellet
5914e6c885
Add a context to question mark icon with tooltip to display it adjusted
...
- This behavior permit use to create custom CSS specifications to display this tooltip best fitted to the context.
2021-02-18 15:02:30 +01:00
Jean-Baptiste Bellet
5b91f096ba
Add unit price information into the cart
...
- .total-price element must be a div (display: block) to be text right aligned (and not being float: right)
- use .option-text to display a grey text
- use display: flex to display question mark icon and text information
2021-02-18 15:02:30 +01:00
Matt-Yorkley
76009c259f
Ensure encodable object in StripeAccountsController
...
Fixes:
```
Admin::StripeAccountsController#connect redirects to Stripe Authorization url constructed OAuth
Failure/Error: url_params = { state: JWT.encode(payload, key, 'HS256'), scope: "read_write" }
JSON::GeneratorError:
only generation of JSON objects or arrays allowed
# ./app/controllers/admin/stripe_accounts_controller.rb:8:in `connect'
# ./spec/controllers/admin/stripe_accounts_controller_spec.rb:18:in `block (3 levels) in <top (required)>'
```
2021-02-18 13:51:01 +00:00
Matt-Yorkley
3976f8ef89
Use params.dig when traversing nested params in passwords controllers
2021-02-18 13:05:16 +00:00
Matt-Yorkley
12c9ac7ccd
Use params.dig when traversing nested params in views
2021-02-18 13:02:58 +00:00
Matt-Yorkley
219c982db7
Re-implement pre-Rails-5 versions of #implement! and #decrement! on Spree::LineItem
...
Rails 5 introduced some breaking changes to these built-in methods, and the new versions no longer work correctly in relation to decrementing stock with VariantOverrides.
2021-02-18 12:28:24 +00:00
Matt-Yorkley
dfadcbd2e0
Fix relation/array modification issues in EnterprisesHelper
2021-02-18 12:28:24 +00:00
Pau Pérez Fabregat
1fc21bdcb3
Merge pull request #6903 from openfoodfoundation/transifex
...
Transifex
2021-02-18 13:23:02 +01:00
Matt-Yorkley
18a354ec1e
Fix private method called
...
```
Failure/Error: variant.stock_items.first.update_attribute(:count_on_hand, 10)
NoMethodError:
private method `count_on_hand=' called for #<Spree::StockItem:0x00005573998948a8>
Did you mean? count_on_hand
count_on_hand?
count_on_hand_was
# ./spec/models/spree/variant_spec.rb:249:in `block (5 levels) in <module:Spree>'
# -e:1:in `<main>'
```
2021-02-18 12:20:29 +00:00
Matt-Yorkley
a8009d044b
Use permit in StripeAccountsController
2021-02-18 12:20:29 +00:00
Matt-Yorkley
1535c680f5
Fix direct params access in StripeAccountsController
2021-02-18 12:20:28 +00:00
Pau Pérez Fabregat
3c208a4fe9
Merge pull request #6911 from mkllnk/remove-dead-rails3-code
...
Remove dead code needed for Rails 3
2021-02-18 12:45:03 +01:00
Pau Pérez Fabregat
a21a8b18b1
Merge pull request #6861 from ccozkan/new-product-form-on_hand-field-improvements
...
Remove required field asterisk from on_hand's field on new products form
2021-02-18 12:39:58 +01:00
Matt-Yorkley
5a260b4e71
Update deprecated middleware configurations
2021-02-18 11:03:20 +00:00
Matt-Yorkley
7230d2767c
Add concern for accessing raw params hash
2021-02-18 11:02:22 +00:00
Matt-Yorkley
c8824ec59f
Fix undefined method #push on ActiveRecord::Relation
2021-02-18 11:00:24 +00:00
Matt-Yorkley
2413afa355
Update patch with warning
2021-02-18 10:57:03 +00:00
Transifex-Openfoodnetwork
1e51884cb2
Updating translations for config/locales/en_FR.yml
2021-02-18 21:46:42 +11:00
Transifex-Openfoodnetwork
cb5543ea75
Updating translations for config/locales/fr.yml
2021-02-18 21:43:20 +11:00
Matt-Yorkley
c8ff745471
Patch paperclip bug
2021-02-18 10:42:57 +00:00
Transifex-Openfoodnetwork
ff423a7b7c
Updating translations for config/locales/de_DE.yml
2021-02-18 20:57:34 +11:00
Transifex-Openfoodnetwork
88e8d110b3
Updating translations for config/locales/es.yml
2021-02-18 18:45:06 +11:00
Transifex-Openfoodnetwork
ce501d4715
Updating translations for config/locales/ca.yml
2021-02-18 18:44:58 +11:00
Maikel Linke
29d7596b4e
Remove dead code needed for Rails 3
...
This was initially added to allow unprivileged database users to run the
app but Rails 4 contains that patch already.
References:
b70edd542719c45b40
2021-02-18 16:18:54 +11:00
Transifex-Openfoodnetwork
a48d8d8a61
Updating translations for config/locales/pt_BR.yml
2021-02-18 10:16:53 +11:00
Andy Brett
f463af327c
Merge pull request #6808 from andrewpbrett/authorize-payment-links
...
Allow a customer to perform further action for a Stripe payment if needed (#4181 )
2021-02-17 10:17:51 -08:00
Pau Pérez Fabregat
8068c6015f
Merge pull request #6836 from coopdevs/customer-balance-reports
...
Customer balance reports
2021-02-17 17:34:37 +01:00
Matt-Yorkley
719b65138f
Add tax total fields to spree_orders
2021-02-17 16:15:34 +00:00
Matt-Yorkley
899552cfee
Improve summing of line item totals
2021-02-17 16:15:34 +00:00
Matt-Yorkley
752d8bd5a0
Start refactoring Order::Updater class
2021-02-17 16:15:34 +00:00
Matt-Yorkley
b31d75aa67
Remove cost_price fields from database
2021-02-17 14:29:30 +00:00
Matt-Yorkley
42a5d7cdc7
Delete dead code Variant#set_option_value
2021-02-17 14:27:51 +00:00
Matt-Yorkley
105f59d959
Delete dead code Variant#default_price?
2021-02-17 14:27:51 +00:00
Matt-Yorkley
4213f66afb
Delete dead code Variant#name_and_sku
2021-02-17 14:27:51 +00:00
Matt-Yorkley
d06fee026c
Delete dead code Variant#on_backorder
2021-02-17 14:27:51 +00:00
Matt-Yorkley
81ac2c5add
Delete code related to :cost_price field
2021-02-17 14:27:51 +00:00
Matt-Yorkley
12dedf8a3b
Merge pull request #6774 from Matt-Yorkley/increase-precision
...
Increase limit on database columns that involve prices
2021-02-17 15:06:19 +01:00
Jean-Baptiste Bellet
c313083593
Specify background position and with/height
...
- Click on this background trigger the tooltip close event.
2021-02-17 14:59:29 +01:00
Transifex-Openfoodnetwork
789e2dca7b
Updating translations for config/locales/de_DE.yml
2021-02-17 23:15:21 +11:00
Pau Pérez Fabregat
766acdf75b
Merge pull request #6900 from openfoodfoundation/try-out-gh-actions-as-ci
...
Add Github CI build workflow
2021-02-17 12:45:15 +01:00
Pau Perez
e4c0fa5043
Add Github CI build workflow
...
based on
https://docs.github.com/en/actions/guides/building-and-testing-ruby#starting-with-the-ruby-workflow-template .
Things worth mentioning:
* ruby/setup-ruby reads `.ruby-version` by default. See:
https://github.com/ruby/setup-ruby#supported-version-syntax
* I chose to run on ubuntu-18.04 because that's what we use in
production. This should reduce potential "it runs on machine but fails
in CI" due to different system libraries versions and such.
We're temporarily running only `spec/queries/` specs because we want it
to finish quickly as we iterate on its configuration.
2021-02-17 12:37:11 +01:00
Pau Pérez Fabregat
a88280566c
Merge branch 'master' into increase-precision
2021-02-17 11:36:36 +01:00
Pau Pérez Fabregat
297927c8df
Merge pull request #6897 from openfoodfoundation/transifex
...
Transifex
2021-02-17 11:12:14 +01:00
Pau Pérez Fabregat
16140b7b0b
Merge pull request #6843 from Matt-Yorkley/tax-rates-double-take
...
Also soft-delete tax rates when changing `included_in_price`
2021-02-17 09:41:07 +01:00
Transifex-Openfoodnetwork
4d07faff06
Updating translations for config/locales/es.yml
2021-02-17 19:37:21 +11:00
