Andy Brett
d62a984939
make orders not capturable if they have a payment pending authorization
2021-02-23 10:26:04 -08:00
Matt-Yorkley
9852470ef6
Merge pull request #6913 from Matt-Yorkley/rails-5-backports
...
Rails 5 backports
2021-02-23 11:55:31 +01:00
dependabot[bot]
37707f4a5b
Bump awesome_nested_set from 3.3.1 to 3.4.0
...
Bumps [awesome_nested_set](https://github.com/collectiveidea/awesome_nested_set ) from 3.3.1 to 3.4.0.
- [Release notes](https://github.com/collectiveidea/awesome_nested_set/releases )
- [Changelog](https://github.com/collectiveidea/awesome_nested_set/blob/master/CHANGELOG )
- [Commits](https://github.com/collectiveidea/awesome_nested_set/compare/v3.3.1...v3.4.0 )
Signed-off-by: dependabot[bot] <support@github.com >
2021-02-23 05:35:38 +00:00
dependabot[bot]
f7173ff0b0
Bump stripe from 5.29.1 to 5.30.0
...
Bumps [stripe](https://github.com/stripe/stripe-ruby ) from 5.29.1 to 5.30.0.
- [Release notes](https://github.com/stripe/stripe-ruby/releases )
- [Changelog](https://github.com/stripe/stripe-ruby/blob/master/CHANGELOG.md )
- [Commits](https://github.com/stripe/stripe-ruby/compare/v5.29.1...v5.30.0 )
Signed-off-by: dependabot[bot] <support@github.com >
2021-02-23 05:35:07 +00:00
Maikel Linke
b61ce13a1b
Add missing helper to UserMailer
2021-02-23 11:24:55 +11:00
Maikel Linke
a971b62068
Emphasise ways to get help in user emails
...
We had a very prominent footer showing how to get in contact with the
local instance people but most users need to get in contact with the
enterprise they are buying from. So removing all those details and
replacing them by a simple "powered by" line will hopefully direct
attention to the shop's contact details.
2021-02-23 11:24:55 +11:00
Maikel
3e0547f563
Merge pull request #6926 from andrewpbrett/check-nan
...
Ensure unit_value is a number
2021-02-23 10:40:00 +11:00
drummer83
7e01b76af2
Create independent title string for 'Map' page
...
The "map" page didn't have a separate Transifex string for the page title. Instead the string 'label_map' was being used, which is also used elsewhere on the website.
To make the page title independent from 'label_map' the title string 'map_title' is added (like on shops page, producers page etc.).
2021-02-22 22:13:46 +01:00
drummer83
43055d8704
Create independent title string for 'Map' page
...
The "map" page didn't have a separate Transifex string for the page title. Instead the string 'label_map' was being used, which is also used elsewhere on the website. So no good idea to change that.
To make the page title independent from 'label_map' the title string is changed to 'map_title' (like on shops page, producers page etc.).
2021-02-22 21:29:42 +01:00
Matt-Yorkley
0e3429dc35
Merge pull request #6758 from Matt-Yorkley/enterprise-fees-refactor
...
Enterprise fees refactor
2021-02-22 17:59:18 +01:00
Andy Brett
dac7176bde
Merge pull request #6922 from jibees/6917-fix-prefilled-date-for-new-date-picker-
...
Separate date format used for server communication from user-readable date
2021-02-22 08:23:51 -08:00
Andy Brett
ff243c40a7
Merge pull request #6885 from andrewpbrett/fix-group-map-icons
...
Move map icons to /public
2021-02-22 08:11:54 -08:00
Matt-Yorkley
d517e5adf6
Simplify matching
2021-02-22 16:03:27 +00:00
Matt-Yorkley
ecf4332527
Use #all_adjustments scope
...
Some of the way these objects are returned by different scopes will be changing soon. This ensures we should get the same results.
2021-02-22 16:03:26 +00:00
Matt-Yorkley
20f4a5359e
Exclude all tax adjustments in item building
...
Included taxes are ignored here, and the additional tax total is is handled separately.
2021-02-22 16:02:19 +00:00
Matt-Yorkley
3ac16432c7
Refactor data representation methods
2021-02-22 16:02:19 +00:00
Matt-Yorkley
8de5ac4680
Extract itemized contents to service
2021-02-22 16:02:19 +00:00
Matt-Yorkley
eaf9305a77
Simplify adjustments summing
2021-02-22 15:45:32 +00:00
Pau Pérez Fabregat
fd067d01f6
Merge pull request #6937 from openfoodfoundation/transifex
...
Transifex
2021-02-22 16:37:54 +01:00
Transifex-Openfoodnetwork
13f5083386
Updating translations for config/locales/de_DE.yml
2021-02-23 02:05:31 +11:00
Transifex-Openfoodnetwork
2aa90a4bbe
Updating translations for config/locales/de_DE.yml
2021-02-23 02:02:28 +11:00
Matt-Yorkley
40d284812a
Extract itemized contents to testable method
2021-02-22 13:12:04 +00:00
Pau Pérez Fabregat
f7f8ecf654
Merge pull request #6930 from openfoodfoundation/dependabot/bundler/activerecord-import-1.0.8
...
Bump activerecord-import from 1.0.7 to 1.0.8
2021-02-22 13:05:41 +01:00
Pau Pérez Fabregat
9c75efdce8
Merge pull request #6921 from openfoodfoundation/transifex
...
Transifex
2021-02-22 13:05:04 +01:00
Jean-Baptiste Bellet
9bc5aa69bb
Use the right default date time format
...
- Using the altInput from flatpickr forces us to use this default date format which is `%Y-%m-%d %H:%M`
2021-02-22 13:00:43 +01:00
Jean-Baptiste Bellet
c22101783c
Forward focus event on original input as flatpickr instance is open
...
- Thus, warning about modifying the opening date of an order cycle with active subscription will trigger (see `spec/features/admin/order_cycles/list_spec.rb`)
2021-02-22 13:00:43 +01:00
Jean-Baptiste Bellet
e93474d493
Look for hidden input using the right date time format
...
- This is an option, and by default it has the previous behavior: look only for visible element
- This option allows us to look for non-visible elements
- Using new altInput from flatpickr create a input hidden element. This is why we need to look at this element.
- Using the altInput from flatpickr forces us to use this default date format
- As we now use `altInput` from flatpickr, the value used to communicate between backend and frontend is stored into an input type hidden.
2021-02-22 13:00:04 +01:00
Jean-Baptiste Bellet
fbe53a3a2e
Use UI to fill date into datetimepicker
...
This creates a new method to select date and time from datetimepicker.
Field cannot be filled "manually" (ie. by entering its value)
2021-02-22 12:58:29 +01:00
Transifex-Openfoodnetwork
83ed5dde85
Updating translations for config/locales/es_US.yml
2021-02-22 20:59:57 +11:00
Transifex-Openfoodnetwork
3698d0b4ad
Updating translations for config/locales/en_GB.yml
2021-02-22 20:10:03 +11:00
Andy Brett
5dcda317d2
add bugsnag alert
2021-02-21 22:27:58 -08:00
Andy Brett
dec6d2189f
add unit test for unit_value
2021-02-21 22:26:36 -08:00
dependabot[bot]
9b13ac78be
Bump activerecord-import from 1.0.7 to 1.0.8
...
Bumps [activerecord-import](https://github.com/zdennis/activerecord-import ) from 1.0.7 to 1.0.8.
- [Release notes](https://github.com/zdennis/activerecord-import/releases )
- [Changelog](https://github.com/zdennis/activerecord-import/blob/master/CHANGELOG.md )
- [Commits](https://github.com/zdennis/activerecord-import/compare/v1.0.7...v1.0.8 )
Signed-off-by: dependabot[bot] <support@github.com >
2021-02-22 05:56:33 +00:00
Andy Brett
55215bb59a
Merge pull request #6899 from Matt-Yorkley/cost-price-dead-code
...
Remove cost_price and other dead code
2021-02-21 11:10:17 -08:00
edmar.galvao@codeminer42.com
cf6fe1a903
Fix the issue #6892
2021-02-21 15:08:50 -03:00
Transifex-Openfoodnetwork
467c05bc50
Updating translations for config/locales/fr_CA.yml
2021-02-22 01:13:31 +11:00
Transifex-Openfoodnetwork
4cc4d1aa68
Updating translations for config/locales/en_CA.yml
2021-02-22 01:05:41 +11:00
Matt-Yorkley
54cd543118
Update data migration to use raw SQL
2021-02-20 19:03:19 +00:00
Matt-Yorkley
24dd971943
Include scopes in migration
2021-02-20 19:03:19 +00:00
Matt-Yorkley
1aeee83c29
Populate tax total fields on spree_orders
2021-02-20 19:03:19 +00:00
Matt-Yorkley
ec7d1d8133
Introduce tax totals in Order::Updater
2021-02-20 19:03:19 +00:00
Andy Brett
e06843c445
ensure unit_value is a number
2021-02-19 14:38:08 -08:00
Transifex-Openfoodnetwork
a5c633cd89
Updating translations for config/locales/en_US.yml
2021-02-20 07:30:09 +11:00
Andy Brett
05736884fe
prepend / to route
2021-02-19 07:43:29 -08:00
Andy Brett
e7489965c5
move map icons to public/
2021-02-19 07:43:23 -08:00
Matt-Yorkley
90f5659e68
Merge pull request #6923 from openfoodfoundation/filipefurtad0-update-doc-1
...
Update CONTRIBUTING.md
2021-02-19 15:56:01 +01:00
Jean-Baptiste Bellet
ce0d33caa6
Add needed class to be displayed as datetimepicker input
...
- + Remplace `ng-disabled` by `ng-if` as its correctly handled by flatpickr/altInput combo.
2021-02-19 15:37:12 +01:00
Jean-Baptiste Bellet
2a504f7359
Add a flatpickr plugin to attach 'id' attribute to input element
...
- As we use `altInput`, the original input is hidden. This plugin forward the `id` attribute of the original input to the input created on-the-fly and used by end user.
2021-02-19 14:59:13 +01:00
filipefurtad0
cc009ba33f
Update CONTRIBUTING.md
...
Added lines on bundle and yarn install. For context see this thread:
https://openfoodnetwork.slack.com/archives/C2GQ45KNU/p1613393033083800
2021-02-19 13:02:03 +00:00
Matt-Yorkley
40eab5f73c
Use params.dig in TaxonsController
2021-02-19 12:12:20 +00:00
