raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-01-31 21:37:16 +00:00
Code Issues Packages Projects Releases Wiki Activity
13,351 Commits 18 Branches 452 Tags
1a0e99dce2ec44b734f24d4d6d524bb4a13b5c19
Commit Graph

13351 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Luis Ramos
1a0e99dce2 Merge pull request #4414 from openfoodfoundation/dependabot/bundler/fuubar-2.5.0 
Bump fuubar from 2.4.1 to 2.5.0
 2019-10-30 10:12:19 +00:00
dependabot-preview[bot]
d7caf91de1 Bump fuubar from 2.4.1 to 2.5.0 
Bumps [fuubar](https://github.com/thekompanee/fuubar) from 2.4.1 to 2.5.0.
- [Release notes](https://github.com/thekompanee/fuubar/releases)
- [Changelog](https://github.com/thekompanee/fuubar/blob/master/CHANGELOG.md)
- [Commits](https://github.com/thekompanee/fuubar/compare/releases/v2.4.1...releases/v2.5.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-10-29 19:30:45 +00:00
Luis Ramos
1e2ab27cda Merge pull request #4327 from kristinalim/feature/4315-prefill_dates_in_orders_and_fulfillment_report 
4315 Set default date range for Orders and Fulfillment report
 2019-10-29 11:11:59 +00:00
Luis Ramos
3e7bd7dc19 Merge pull request #4376 from luisramos0/ghosts 
Remove product from Order Cycles if product supplier changes
 2019-10-28 21:17:48 +00:00
Luis Ramos
688dad2334 Merge pull request #4384 from chaserx/4378_display_customer_name_on_orders_table 
adds the full_name of the customer ordering beneath email
 2019-10-28 15:52:54 +00:00
Luis Ramos
6d419d60ae Merge pull request #4405 from openfoodfoundation/dependabot/bundler/bugsnag-6.12.2 
Bump bugsnag from 6.12.1 to 6.12.2
 2019-10-28 11:37:30 +00:00
luisramos0
0dc8ae1561 Merging find_product and find_variant into one single method 
This fixes rubocop issue, class has too many lines
 2019-10-27 20:09:42 +00:00
luisramos0
07fcc8f361 Refactor ExchangeVariantDeleter.new.delete out of update_product_only_attributes into correct place update_product 
Also extracted find_product from update_attributes and find_variant out of create_or_update_variant to make code simpler
 2019-10-27 19:13:57 +00:00
Pau Pérez Fabregat
237cd5438b Merge pull request #4373 from openfoodfoundation/dependabot/bundler/i18n-js-3.4.0 
Bump i18n-js from 3.3.0 to 3.4.0
 2019-10-25 13:47:25 +02:00
Pau Pérez Fabregat
4e366d0f2e Merge pull request #4390 from Matt-Yorkley/3831_flaky_spec 
Fix flaky product import spec
 2019-10-25 13:42:54 +02:00
dependabot-preview[bot]
fb3af77d0b Bump bugsnag from 6.12.1 to 6.12.2 
Bumps [bugsnag](https://github.com/bugsnag/bugsnag-ruby) from 6.12.1 to 6.12.2.
- [Release notes](https://github.com/bugsnag/bugsnag-ruby/releases)
- [Changelog](https://github.com/bugsnag/bugsnag-ruby/blob/master/CHANGELOG.md)
- [Commits](https://github.com/bugsnag/bugsnag-ruby/compare/v6.12.1...v6.12.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-10-24 19:19:06 +00:00
Luis Ramos
1fa6e4bea8 Merge pull request #4385 from chaserx/4304_fixes_missing_translation 
adds missing :spree to i18n scopes
 2019-10-24 17:06:50 +01:00
Luis Ramos
498a2b7462 Merge pull request #4386 from andrewjprice/missing-translations-inventory-page 
Missing translations inventory page
 2019-10-24 17:06:43 +01:00
Matt-Yorkley
0ac0bdc381 Update all locales with the latest Transifex translations 2019-10-23 21:20:11 +01:00
Matt-Yorkley
1a756cbc6b Merge pull request #4387 from openfoodfoundation/transifex 
Transifex
v2.6.0 		2019-10-23 21:17:20 +01:00
Matt-Yorkley
00e869f40c Merge pull request #4393 from mkllnk/4392-rescue-network-fails 
Avoid asking the cloud if an image exists
 2019-10-23 16:55:49 +01:00
Transifex-Openfoodnetwork
e849c4867b Updating translations for config/locales/nb.yml 2019-10-23 18:58:07 +11:00
Maikel Linke
ada34d27ca Avoid asking the cloud if an image exists 
https://github.com/openfoodfoundation/openfoodnetwork/issues/4392

Amazon's DNS is failing at the moment and some users can't access the
admin panel because of this error.

While `exists?` asks the storage server if the file is actually there,
`file?` just checks if we have the file name stored in the database
and the file should be there. It's much faster and less error prone.
 2019-10-23 11:36:20 +11:00
Transifex-Openfoodnetwork
0288dfc992 Updating translations for config/locales/ar.yml 2019-10-23 07:18:46 +11:00
luisramos0
3372339907 Fix default stock translation by using t filter instead of t function 2019-10-22 17:29:04 +01:00
Matt-Yorkley
f7bb609546 Fix flaky product import spec 2019-10-22 12:02:11 +01:00
Luis Ramos
02c0b89fa0 Merge pull request #4345 from Matt-Yorkley/shopfront_pagination 
Shopfront pagination
 2019-10-21 16:02:12 +01:00
luisramos0
f57c9d4a25 Fix rubocop issue in product_set.update_product_only_attributes: method has too many lines 2019-10-21 15:20:53 +01:00
luisramos0
783c3c9e90 Add spec to product set to cover case where product and variants attributes are both provided and the product supplier is not, in that case, ExchangeVariantDeleter would not execute and update_product_only_attributes would return nil cancelling update_product_variants from being executed. Now, update_product_only_attributes always returns true if product.save suceeeds, no matter what ExchangeVariantDeleter returns 2019-10-21 14:45:27 +01:00
luisramos0
44753d0320 Add spec coverage for case in product_set where variants_attributes are used 2019-10-21 13:27:21 +01:00
luisramos0
dd7d5803ba Add new context to spec so that some basic setup can be shared with new specs that will be added, it's mostly indentation here 2019-10-21 13:01:39 +01:00
Luis Ramos
c9e23154d8 Merge pull request #4352 from tkusuki/fix-translation-in-enterprise-welcome-email 
Add missing translation in non English enterprise welcome email
 2019-10-21 11:41:53 +01:00
Rachel Arnould
279b633513 Add welcome board to the contributing page 2019-10-21 12:19:01 +02:00
Transifex-Openfoodnetwork
9d0ac79983 Updating translations for config/locales/pt_BR.yml 2019-10-21 11:29:14 +11:00
Andrew
deb17f47a7 Add default_stock to en.yml and _products_variants 2019-10-19 16:33:31 -07:00
Chase Southard
61ee0f04a6 adds missing :spree to i18n scopes 2019-10-19 13:55:11 -04:00
Chase Southard
353804a3fa adds the full_name of the customer ordering beneath email 2019-10-19 12:32:59 -04:00
Andrew
598426a5e9 Add Save Changes button translation 2019-10-18 22:18:54 -07:00
Matt-Yorkley
7b0c55e15a Ensure producer properties are included in properties results 2019-10-18 21:15:13 +01:00
Matt-Yorkley
cbe2477d04 Fix property filters and improve test coverage 2019-10-18 21:15:13 +01:00
Matt-Yorkley
c730958fe4 Restrict search params passed to ProductsRenderer 2019-10-18 21:15:13 +01:00
Matt-Yorkley
37e5e1923c Improve filter buttons UX 2019-10-18 21:15:13 +01:00
Matt-Yorkley
542c1bf684 #slice :params in controller and rename to :args in service context 2019-10-18 21:15:13 +01:00
Matt-Yorkley
06c896b93b Add spec for Api::ProductSerializer 2019-10-18 21:15:13 +01:00
Matt-Yorkley
6433d69d02 Add comments on scoping ProductsRenderer results 2019-10-18 21:15:13 +01:00
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