Jean-Baptiste Bellet
d97b46cd5b
add new feature for beta testers: unit_price
...
The aim of this "feature toggle" is to enable the unit price display for each product/variants.
By default activate on both development and staging environment.
2021-02-16 15:26:21 +01:00
Matt-Yorkley
3da5c0d7fd
Update TaxRate transition spec
...
Setting a tax rate to included fails a validation if a default zone doesn't exist, so that's added. Also improved the tested scenarios and some of the details checked on the updated objects.
2021-02-16 13:21:57 +00:00
Pau Perez
36ce39a217
Sort OC report orders by completed_at
...
This is then consistent with the ordering we use to list orders in
/admin, which is more useful. As a result, the test is also more robust.
2021-02-16 13:25:21 +01:00
dependabot[bot]
c56c5d0028
Bump rswag from 2.3.3 to 2.4.0
...
Bumps [rswag](https://github.com/rswag/rswag ) from 2.3.3 to 2.4.0.
- [Release notes](https://github.com/rswag/rswag/releases )
- [Changelog](https://github.com/rswag/rswag/blob/master/CHANGELOG.md )
- [Commits](https://github.com/rswag/rswag/compare/2.3.3...2.4.0 )
Signed-off-by: dependabot[bot] <support@github.com >
2021-02-16 08:52:23 +00:00
Pau Pérez Fabregat
77dc6b7d57
Merge pull request #6890 from openfoodfoundation/dependabot/bundler/rubocop-1.10.0
...
Bump rubocop from 1.9.1 to 1.10.0
2021-02-16 09:51:15 +01:00
Pau Pérez Fabregat
fc25a921d3
Merge pull request #6891 from openfoodfoundation/transifex
...
Transifex
2021-02-16 09:50:13 +01:00
Transifex-Openfoodnetwork
67a201de55
Updating translations for config/locales/en_GB.yml
2021-02-16 18:07:29 +11:00
dependabot[bot]
e87550f1e9
Bump rubocop from 1.9.1 to 1.10.0
...
Bumps [rubocop](https://github.com/rubocop-hq/rubocop ) from 1.9.1 to 1.10.0.
- [Release notes](https://github.com/rubocop-hq/rubocop/releases )
- [Changelog](https://github.com/rubocop-hq/rubocop/blob/master/CHANGELOG.md )
- [Commits](https://github.com/rubocop-hq/rubocop/compare/v1.9.1...v1.10.0 )
Signed-off-by: dependabot[bot] <support@github.com >
2021-02-16 05:32:38 +00:00
Maikel Linke
445fae4d09
Use Google's map tiles with Google Maps
...
We started to move to Open Street Maps (OSM) and one simple change was
to show OSM tiles on top of the current Google Maps functionality. This
hybrid use violates Google's terms and conditions though and I'm
reverting it here (basically reverting daa5b00a2
2021-02-16 14:30:24 +11:00
Andy Brett
560ad49057
unit tests for ProcessPaymentIntent
2021-02-15 18:09:07 -08:00
Andy Brett
05e762ff21
add controller specs for confirming payment intent
2021-02-15 17:09:38 -08:00
Andy Brett
f8239ed3ed
use image path generator for map icons
2021-02-15 14:43:34 -08:00
Çağrı Özkan
dee2095a13
Remove required star from on_hand field
2021-02-16 00:23:53 +03:00
Çağrı Özkan
6fad35a975
Checkout upstream's admin/products/new view
2021-02-16 00:22:09 +03:00
Pau Pérez Fabregat
897a0c7779
Merge pull request #6880 from openfoodfoundation/transifex
...
Transifex
2021-02-15 16:47:51 +01:00
Transifex-Openfoodnetwork
8277093fa9
Updating translations for config/locales/de_DE.yml
2021-02-15 23:32:14 +11:00
Pau Pérez Fabregat
ffc850a794
Merge pull request #6876 from openfoodfoundation/transifex
...
Transifex
2021-02-15 11:50:41 +01:00
Transifex-Openfoodnetwork
347f193aeb
Updating translations for config/locales/es.yml
2021-02-15 19:56:52 +11:00
Transifex-Openfoodnetwork
0084aff9d4
Updating translations for config/locales/ca.yml
2021-02-15 19:56:38 +11:00
Transifex-Openfoodnetwork
03d8ecbb56
Updating translations for config/locales/en_FR.yml
2021-02-15 19:27:01 +11:00
Transifex-Openfoodnetwork
41defd3d2f
Updating translations for config/locales/fr.yml
2021-02-15 19:26:36 +11:00
Andy Brett
01293a3a3a
Merge pull request #6863 from turinglabsorg/master
...
deleting only OFN related Docker containers and images
2021-02-13 09:24:00 -08:00
Andy Brett
77a3649e50
documentation
2021-02-12 13:46:05 -08:00
Andy Brett
c851705d5a
reload order's new state after processing payment
2021-02-12 13:36:17 -08:00
Andy Brett
cd2b4d2fb2
advance order after processing payment intent
2021-02-12 13:36:04 -08:00
Andy Brett
8c7bf863f8
return pending payments in order serializer
2021-02-12 12:20:35 -08:00
Andy Brett
6efad74c5c
add authorize link to transactions page
2021-02-12 12:20:35 -08:00
Andy Brett
1b2416652f
update translations
2021-02-12 10:45:54 -08:00
Andy Brett
538dfb1e59
Merge pull request #6868 from openfoodfoundation/transifex
...
Transifex
2021-02-12 10:36:46 -08:00
Andy Brett
0a7396eb1c
Merge pull request #6713 from andrewpbrett/sca-subs-emails
...
Send emails when subscription payments require SCA auth
2021-02-12 08:23:32 -08:00
Jean-Baptiste Bellet
034153dacf
Fix some columns grid system issues
...
- Use class directly instead of attribut of element (`.three` instead of `%div{ :class => "three"}` )
- Correct a lots of bad calculation about columns grid system
- Use class instead of style if it's possible (`.text-center` instead of `:style => 'text-align: center;'`)
2021-02-12 10:02:27 +01:00
Transifex-Openfoodnetwork
2981be7013
Updating translations for config/locales/en_US.yml
2021-02-12 12:56:39 +11:00
Maikel
9aa7dd3206
Merge pull request #6714 from luisramos0/rails5-new
...
[Rails 5] Update Gemfile_next.lock and fix app/services/permissions/order.rb
2021-02-12 12:32:39 +11:00
Andy Brett
7c2febdd78
Merge pull request #6813 from jibees/6795-missing-cases-for-loading-spinner
...
Make loading spinner visible
2021-02-11 10:55:05 -08:00
Andy Brett
b5e9c935e9
Merge pull request #6821 from cillian/admin-product-sorting-bug
...
Include sort direction parameter during bulk product update to prevent JS error causing 'Saving' text to hang
2021-02-11 10:54:24 -08:00
Andy Brett
5a8a3b8d6b
Merge pull request #6822 from arku/chore/cost-price-removal
...
Remove cost price field field from product variant form
2021-02-11 10:48:00 -08:00
Andy Brett
96a746175d
update spec with new behavior
2021-02-11 10:36:50 -08:00
Pau Pérez Fabregat
7f882bfe92
Merge pull request #6295 from luisramos0/remove_pin
...
Remove Pin Payments
2021-02-11 18:04:59 +01:00
Transifex-Openfoodnetwork
96dea93745
Updating translations for config/locales/en_FR.yml
2021-02-12 03:56:37 +11:00
Transifex-Openfoodnetwork
6d87861efc
Updating translations for config/locales/fr.yml
2021-02-12 03:55:05 +11:00
Transifex-Openfoodnetwork
69724cfc24
Updating translations for config/locales/ru.yml
2021-02-12 02:51:41 +11:00
Transifex-Openfoodnetwork
09575b20bd
Updating translations for config/locales/de_DE.yml
2021-02-12 02:51:40 +11:00
Transifex-Openfoodnetwork
e168393662
Updating translations for config/locales/es.yml
2021-02-12 02:37:16 +11:00
Transifex-Openfoodnetwork
ae8488da92
Updating translations for config/locales/ca.yml
2021-02-12 02:35:35 +11:00
turinglabsorg
07a42e8a21
deleting only OFN related Docker containers and images
2021-02-11 14:30:07 +01:00
Pau Pérez Fabregat
99dbd8afa7
Merge pull request #6791 from filipefurtad0/customers_spec
...
enhances customers_spec.rb to check customer balance, after additional payments were added to an order
2021-02-11 11:36:30 +01:00
Pau Pérez Fabregat
5fd1bc3604
Merge pull request #6862 from openfoodfoundation/dependabot/bundler/geocoder-1.6.5
...
Bump geocoder from 1.6.4 to 1.6.5
2021-02-11 11:23:13 +01:00
Pau Pérez Fabregat
7fe79eccea
Merge pull request #6691 from jibees/6664-new-datetimepicker
...
6664 new datetimepicker
2021-02-11 11:21:19 +01:00
Pau Pérez Fabregat
34ce3c0db1
Merge branch 'master' into remove_pin
2021-02-11 11:19:18 +01:00
Pau Perez
23b0885f4b
Turn ivars into private attr_readers
...
This makes them more changeable and robust. Ruby will raise
NoMethodError on typos while it'll silently create a new ivar without
us noticing. Also, in my experience, a reader method gives more room to
future refactorings and eases testing because methods are easier to
stub.
2021-02-11 11:04:39 +01:00
