luisramos0
a2bc61cb4d
Remove unused field orders.shipping_method_id
2019-10-08 09:09:19 +01:00
Pau Pérez Fabregat
057572a445
Merge pull request #4321 from luisramos0/fix_pt_br
...
Delete old pt-BR translations file (it's now correctly called pt_BR)
2019-10-08 08:49:12 +02:00
Pau Pérez Fabregat
3403ab4162
Merge pull request #4340 from openfoodfoundation/sigmundpetersen-patch-1
...
Delete ISSUE_TEMPLATE.md
2019-10-08 08:48:47 +02:00
Luis Ramos
9a036d18b7
Merge pull request #4271 from luisramos0/no_obsolete_master
...
Remove logic related to master variants in Exchanges and migrate data
2019-10-07 15:22:53 +01:00
luisramos0
f2b57057cd
Add migration to delete all master variants from exchanges and replace them with standard variants
2019-10-07 14:53:44 +01:00
luisramos0
95bc8fa984
Remove logic from OrderCycleDistributedProducts related to obsolete master variants in OCs, this is a condition that will never happen now since we ensure products always have a standard variants
...
A migration will be added as well to clean up any very old master variants available in order cycles
2019-10-07 14:53:44 +01:00
Luis Ramos
54c44c33eb
Merge pull request #4324 from Matt-Yorkley/reports_memoize
...
Reports memoization
2019-10-07 13:20:03 +01:00
Luis Ramos
8a732568e7
Merge pull request #4325 from kristinalim/feature/4312-remove_find_variant_in_orders_and_fulfillment_report
...
4312 Use association instead of OrderAndFulfillmentsReport#find_variant
2019-10-07 11:38:37 +01:00
Pau Pérez Fabregat
f4523f0305
Merge pull request #4350 from luisramos0/docker
...
Update ruby version in dockerfile and in getting started
2019-10-04 16:21:22 +02:00
Luis Ramos
96428c11c6
Merge pull request #4334 from Matt-Yorkley/products_renderer
...
Products renderer
2019-10-03 13:47:04 +01:00
Luis Ramos
c15660da0e
Merge pull request #4269 from luisramos0/spree_be_config
...
Move shipping_methods and shipping categories from spree_backend to OFN
2019-10-03 13:45:17 +01:00
luisramos0
c5b939c8ee
Update ruby version in dockerfile and in getting started
2019-10-02 23:45:23 +01:00
Luis Ramos
e6408161db
Merge pull request #4291 from luisramos0/spree_be_config_taxons
...
Move taxons and taxonomies from spree_backend to OFN
2019-10-02 21:13:12 +01:00
Luis Ramos
4540b32d3a
Merge branch 'master' into spree_be_config_taxons
2019-10-02 15:35:15 +01:00
Luis Ramos
9f8d2fddbc
Merge pull request #4292 from luisramos0/spree_be_config_tax
...
Move tax_rates, tax categories and tax settings from spree_backend to OFN
2019-10-02 15:33:32 +01:00
Luis Ramos
14047c620a
Merge branch 'master' into spree_be_config_tax
2019-10-02 15:31:25 +01:00
Luis Ramos
2be1c231f7
Merge pull request #4290 from luisramos0/spree_be_config_zones
...
Move zones, countries and states from spree_backend to OFN
2019-10-02 14:30:59 +01:00
Luis Ramos
c34646724c
Merge pull request #4254 from luisramos0/swagger
...
Update API swagger docs to reflect current API state
2019-10-02 10:31:13 +01:00
Luis Ramos
b731635270
Merge pull request #4303 from luisramos0/missing_translation
...
Add missing translation for order.shipment.state "on hand" (with a space between on and hand)
2019-10-02 10:27:33 +01:00
Luis Ramos
3f7aff4b8b
Merge pull request #4305 from luisramos0/new_product_translations
...
Make translations in new product page relative and specific to the page
2019-10-01 22:38:49 +01:00
Sigmund Petersen
5fded022d4
Update README.md
...
Slack invite link changed
2019-10-01 23:09:47 +02:00
Pau Pérez Fabregat
1f644f4020
Merge pull request #4281 from Matt-Yorkley/memcached-apm
...
Add memcached APM
2019-10-01 18:46:22 +02:00
Matt-Yorkley
cc11d4e5f0
Remove unused user parameter from OrdersAndFulfillmentsReport
2019-10-01 15:59:51 +01:00
Pau Pérez Fabregat
5ecac77aa5
Merge branch 'master' into memcached-apm
2019-10-01 16:58:01 +02:00
Matt-Yorkley
a5d2579c69
Pluck line_item ids instead of all line_items
2019-10-01 15:51:45 +01:00
Matt-Yorkley
112adb11db
Pass permissions object into OrdersAndFulfillMentsReport
2019-10-01 15:51:43 +01:00
Matt-Yorkley
c038b485b1
Rename service and methods to remove use of "shop" term
2019-10-01 14:43:47 +01:00
Luis Ramos
19eb93012c
Merge pull request #4326 from kristinalim/feature/4310-remove_shipments_count
...
4310 Do not count order shipments in Order#shipping_method
2019-10-01 11:17:42 +01:00
Luis Ramos
d998ec8453
Merge pull request #4331 from openfoodfoundation/dependabot/bundler/uglifier-4.2.0
...
Bump uglifier from 4.1.20 to 4.2.0
2019-10-01 11:11:35 +01:00
Luis Ramos
0c93665030
Merge pull request #4335 from Matt-Yorkley/remove_deprecations
...
Remove deprecation warnings from VariantStock methods
2019-10-01 10:59:57 +01:00
Luis Ramos
c4d298d732
Merge branch 'master' into remove_deprecations
2019-10-01 10:57:10 +01:00
Luis Ramos
8c252fc160
Merge pull request #4341 from openfoodfoundation/dependabot/bundler/webmock-3.7.6
...
Bump webmock from 3.7.5 to 3.7.6
2019-10-01 10:53:54 +01:00
Pau Pérez Fabregat
c2f8803d72
Merge pull request #4297 from luisramos0/inv_levels
...
Remove all usages of Spree Config track_inventory_levels
2019-10-01 10:35:20 +02:00
dependabot-preview[bot]
07967275d8
Bump webmock from 3.7.5 to 3.7.6
...
Bumps [webmock](https://github.com/bblimke/webmock ) from 3.7.5 to 3.7.6.
- [Release notes](https://github.com/bblimke/webmock/releases )
- [Changelog](https://github.com/bblimke/webmock/blob/master/CHANGELOG.md )
- [Commits](https://github.com/bblimke/webmock/compare/v3.7.5...v3.7.6 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-09-30 22:02:54 +00:00
Sigmund Petersen
c7db1b7fc0
Delete ISSUE_TEMPLATE.md
...
This ISSUE_TEMPLATE.md file is the old way of handling templates on Github. OFN is now using the new method for handling templates, so this file can be removed.
This template still comes up as 'Default template' when opening an issue from the Zenhub board. This gives 2 almost equal template choices which is confusing.
2019-09-30 21:18:51 +02:00
Rachel Arnould
fa57d71a23
Merge pull request #4332 from openfoodfoundation/RachL-patch-2
...
Update story template
2019-09-30 20:06:12 +02:00
Rachel Arnould
be5e7bd18d
Merge pull request #4330 from openfoodfoundation/RachL-patch-1
...
Update bug template
2019-09-30 20:05:51 +02:00
Luis Ramos
d162e8c087
Merge pull request #4300 from daningenthron/daningenthron/add-a-new-card
...
Translation: "Add new credit card"
2019-09-30 13:27:25 +01:00
Luis Ramos
75a56c2be5
Merge pull request #4293 from jasonk357/4031-change-user-email-alert
...
Improve user email change flash alert message
2019-09-30 13:19:40 +01:00
Luis Ramos
07a5963554
Merge pull request #4311 from mkllnk/rails3-deprecations
...
Replace deprecated validates_presence_of
2019-09-30 13:19:25 +01:00
luisramos0
a6888cf0be
Update all locales with the latest Transifex translations
2019-09-30 13:15:45 +01:00
Luis Ramos
ef35db6db2
Merge pull request #4296 from luisramos0/subs_line_items
...
Make subscription line items handle soft deleted variants
2019-09-30 13:07:10 +01:00
Rachel Arnould
375d4fbffd
Add workaround item
2019-09-30 11:02:36 +02:00
Matt-Yorkley
6153789055
Eager-load serialized objects in variant query
2019-09-29 20:44:48 +01:00
Matt-Yorkley
032741c54f
Refactor ProductsRenderer variants queries
...
This removes another N+1 and allows pagination applied to the inital query to also affect the returned variants
2019-09-29 17:41:58 +01:00
Matt-Yorkley
e9acf6e0de
Refactor #load_products and memoize
2019-09-29 14:30:04 +01:00
Matt-Yorkley
d5e90c3c6c
Extract #load_products logic into a new service
2019-09-29 00:10:47 +01:00
Matt-Yorkley
7e7429446d
Remove deprecation warnings from VariantStock methods
2019-09-27 17:28:16 +01:00
Matt-Yorkley
535e389fb4
Query variant stock including overrides
...
This allows the results to be properly filtered and paginated whilst showing the correct stock, and removes a big N+1
2019-09-27 17:25:52 +01:00
Matt-Yorkley
cecebb82f4
Move distributed products relation out from OrderCycleDistributedProducts
2019-09-27 17:25:50 +01:00
