raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-10 23:07:47 +00:00
Code Issues Packages Projects Releases Wiki Activity
19,029 Commits 20 Branches 453 Tags
07a42e8a2127377e7dcdc8f1136838cdafcfc46b
Commit Graph

19029 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Matt-Yorkley
bf8c632fce Refactor ProductsCtrl request params 2019-10-18 21:15:13 +01:00
Matt-Yorkley
b3c89a9d6c Move OpenFoodNetwork::ProductsRenderer (lib) to ProductsRenderer (service) and refactor 2019-10-18 21:15:13 +01:00
Matt-Yorkley
d45403f1d4 Add specs for Api::OrderCyclesController 2019-10-18 21:15:13 +01:00
Matt-Yorkley
f2affe80cd Reduce assignment branching and complexity for ProductsRenderer#products 2019-10-18 21:15:13 +01:00
Matt-Yorkley
573a69477f Fix filters not updating on OC change 2019-10-18 21:15:13 +01:00
Matt-Yorkley
c6ce516129 Fix prices not updating with new exchange fees when changing OC 2019-10-18 21:15:13 +01:00
Matt-Yorkley
2539b84b33 Fix product.meta_keywords not searchable 2019-10-18 21:15:13 +01:00
Matt-Yorkley
dd6d0d25da Fix problematic feature specs 2019-10-18 21:15:13 +01:00
Matt-Yorkley
c54cff10d4 Adjust API endpoint params 2019-10-18 21:15:13 +01:00
Matt-Yorkley
ab330e882e Remove product cache 2019-10-18 21:15:11 +01:00
luisramos0
a50ae3f8ce Clarify the API of product_set class by making all other methods to private 2019-10-18 10:37:23 +01:00
luisramos0
9f3b4100c3 Improve code by incorporating code review feedback 2019-10-18 10:26:03 +01:00
luisramos0
b625ea0c61 Extract to class ExchangeVariantDeleter 2019-10-17 19:13:45 +01:00
luisramos0
8857404ddf Remove product variants from all Order Cycles if supplier is changed 2019-10-17 19:12:24 +01:00
luisramos0
49f98422fd Remove product from Order Cycles if supplier changes as with a new supplier the rules/permissions to add a product to an Order Cycle may be different 2019-10-17 17:47:15 +01:00
Maikel Linke
20cabe6f12 Update from Transifex v2.5.3 2019-10-17 17:11:10 +11:00
Maikel
fe849b8dfd Merge pull request #4367 from openfoodfoundation/transifex 
Transifex
 2019-10-17 17:07:23 +11:00
Luis Ramos
167b44c30f Merge pull request #4365 from kristinalim/fix/4308-eager_load_associations_in_orders_and_fulfillment_reports 
4308 Eager-load associations in Orders and Fulfillment reports
 2019-10-16 21:39:30 +01:00
Luis Ramos
ad247e2116 Merge pull request #4268 from luisramos0/add_order_endpoint 
Add api/orders/{order_number} API endpoint
 2019-10-16 21:22:27 +01:00
Luis Ramos
e46875376e Merge pull request #4168 from mkllnk/4160-product-report-filters 
4160 Fix product report filters
 2019-10-16 14:47:55 +01:00
Jackson Bates
4d49dc3689 adds line breaks to methods for readability 2019-10-16 23:01:38 +11:00
Luis Ramos
d7223c508a Merge pull request #4289 from luisramos0/spree_be_config_general 
Move general_settings, mail_methods and image_settings from spree_backend to OFN
 2019-10-16 12:08:36 +01:00
Kristina Lim
a91a23aa39 Eager-load associations for Orders and Fulfillment report subtypes 2019-10-16 19:06:35 +08:00
luisramos0
04bf5a8742 Convert images views from erb to haml 2019-10-16 11:58:08 +01:00
Jackson Bates
8d30dc997f adds better description to specs and refactors editProductUrl and confirm_unsaved_changes 2019-10-16 21:55:52 +11:00
luisramos0
6bc0d505e4 Fix some rubocop issues 2019-10-16 10:40:16 +01:00
luisramos0
9a0f1adfd2 Reorganize/simplify before filters 2019-10-16 10:40:09 +01:00
Luis Ramos
370f66e36b Merge pull request #4364 from kristinalim/refactor/4308-refactor_orders_and_fulfillment_report_types 
4308 Refactor Orders and Fulfillment report subtypes
 2019-10-16 10:30:24 +01:00
Luis Ramos
f7cdcf02e0 Merge pull request #4343 from openfoodfoundation/dependabot/bundler/oauth2-1.4.2 
Bump oauth2 from 1.4.1 to 1.4.2
 2019-10-16 10:29:25 +01:00
luisramos0
1eafb1a3fe Bring specs from spree_backend to payment methods controller spec 2019-10-15 18:49:35 +01:00
luisramos0
cf40bfa58e Simbolize keys in opts hash in xero report so that opts access works again 2019-10-15 18:05:40 +01:00
Matt-Yorkley
8e03f402b1 Use Ruby 2.2.10 2019-10-15 14:59:24 +01:00
Pau Pérez Fabregat
1ee43fb495 Merge pull request #4358 from openfoodfoundation/dependabot/bundler/rspec-rails-3.9.0 
Bump rspec-rails from 3.8.2 to 3.9.0
 2019-10-15 10:25:23 +02:00
dependabot-preview[bot]
5a84a3688b Bump i18n-js from 3.3.0 to 3.4.0 
Bumps [i18n-js](https://github.com/fnando/i18n-js) from 3.3.0 to 3.4.0.
- [Release notes](https://github.com/fnando/i18n-js/releases)
- [Changelog](https://github.com/fnando/i18n-js/blob/master/CHANGELOG.md)
- [Commits](https://github.com/fnando/i18n-js/compare/v3.3.0...v3.4.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-10-15 04:57:00 +00:00
Transifex-Openfoodnetwork
e139d24639 Updating translations for config/locales/en_CA.yml 2019-10-15 12:06:18 +11:00
luisramos0
ec3c3aa644 Bring images views from spree_backend 2019-10-15 00:02:40 +01:00
luisramos0
0f128f43f9 Merge images controller decorator with the controller brought from spree_backend 2019-10-15 00:02:16 +01:00
luisramos0
ea9f3ad6a0 Bring images controller from spree_backend so we can merge it with ofn's decorator 2019-10-15 00:00:54 +01:00
luisramos0
e48ac64d37 Prepare spec to integrate some specs coming from spree_backend 2019-10-14 23:17:43 +01:00
luisramos0
1c257cca3f Merge payment methods controller brought from spree_backend with its decorator that was in OFN 2019-10-14 23:14:09 +01:00
luisramos0
c51e4d657a Bring payment method controller from spree_backend 2019-10-14 23:09:23 +01:00
Luis Ramos
0dfe749496 Merge pull request #4356 from kristinalim/fix/4256-set_dalli_value_max_size 
4256 Configure dalli store value max bytes from env variable
 2019-10-14 18:41:00 +01:00
Luis Ramos
d6eade6fa3 Merge pull request #4363 from jonleighton/fix-docker-setup 
Fix error during first run of docker-compose
 2019-10-14 13:38:04 +01:00
Luis Ramos
109aed684e Merge pull request #4344 from openfoodfoundation/dependabot/bundler/ddtrace-0.28.0 
Bump ddtrace from 0.27.0 to 0.28.0
 2019-10-14 12:39:52 +01:00
Luis Ramos
35d76ac991 Merge pull request #4298 from luisramos0/variant_edit 
Make unit description visible in the variant edit page even for products which variant_unit is items
 2019-10-13 19:54:41 +01:00
Luis Ramos
1ab9e9d7a5 Merge pull request #4299 from luisramos0/drop_order_ship_method_id 
Remove unused field orders.shipping_method_id
 2019-10-13 19:54:13 +01:00
Luis Ramos
e5e716e150 Merge pull request #4336 from openfoodfoundation/dependabot/bundler/rubyzip-1.3.0 
[Security] Bump rubyzip from 1.2.2 to 1.3.0
 2019-10-13 19:53:48 +01:00
Luis Ramos
b6510c3ab6 Merge pull request #4262 from daningenthron/daningenthron/default-shipping-category 
Prefill shipping category forms with default values
 2019-10-13 19:52:43 +01:00
Transifex-Openfoodnetwork
a158a986c6 Updating translations for config/locales/en_US.yml 2019-10-11 13:06:17 +11:00
Kristina Lim
c7643db66f Remove unnecessary Orders and Fulfillment lines in .rubocop_manual_todo.yml 2019-10-10 21:05:06 +08:00