raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-01-24 20:36:49 +00:00
Code Issues Packages Projects Releases Wiki Activity
13,380 Commits 21 Branches 450 Tags
818d41ffac8dccb4a6fa0a377f8cf3758ffaa4e0
Commit Graph

13380 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Maikel
818d41ffac Merge pull request #4418 from AndrewCleve/readme-grammar-fix 
Improve readability of README.md
 2019-11-01 16:48:12 +11:00
Maikel
14f67053c8 Merge pull request #4400 from coopdevs/task-to-remove-enterprise-limit 
Task to remove limit of ent. that can be created
 2019-11-01 15:57:12 +11:00
Luis Ramos
bef745378e Merge pull request #4395 from luisramos0/delete_prototypes 
Delete prototypes tables and all references in pages
 2019-10-31 20:06:38 +00:00
luisramos0
a6cb5903d6 Delete prototypes tables and all references in pages 2019-10-31 13:23:42 +00:00
Luis Ramos
d1b36aded0 Merge pull request #4359 from daningenthron/daningenthron/required-fields-new-order-cycle 
Add asterisks to required fields in New Order Cycle form
 2019-10-31 12:50:48 +00:00
Luis Ramos
9c3c74aa93 Merge pull request #4394 from luisramos0/fix_product_sub_menu 
Merge duplicated product_sub_menu partials
 2019-10-31 12:48:27 +00:00
Pau Pérez Fabregat
4af014df6b Merge pull request #4342 from JacksonBates/edit-button-new-window 
makes edit button action open a new tab
 2019-10-31 11:45:11 +01:00
Pau Pérez Fabregat
be6c64db75 Merge pull request #4354 from agustinariq/3832-WYSIWYG-highlight-links 
#3832 - Added color to links in WYSIWYG editor
 2019-10-31 11:44:11 +01:00
AndrewCleve
1aebc30128 Improve readability of README.md 
Made minor changes to grammar to improve consistency and readability.
 2019-10-30 19:43:38 -07:00
Pau Pérez Fabregat
d6d2c19dc7 Merge pull request #4398 from Matt-Yorkley/db_indexes 
Add order_cycle_id and distributor_id indexes to spree_orders table
 2019-10-30 16:36:23 +01:00
Pau Pérez Fabregat
f897478736 Merge pull request #4402 from coopdevs/task-to-remove-unused-enterprise 
Task to remove an unused enterprise
 2019-10-30 16:34:28 +01:00
Pau Pérez Fabregat
064b86da5d Merge pull request #4407 from luisramos0/fix_sample_data 
Add tax category to sample products
 2019-10-30 15:37:53 +01:00
Pau Pérez Fabregat
f7b58300f9 Merge pull request #4362 from openfoodfoundation/dependabot/bundler/activerecord-import-1.0.3 
Bump activerecord-import from 1.0.2 to 1.0.3
 2019-10-30 15:13:47 +01:00
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
f396f6bebd Add tax category to sample products 2019-10-27 19:59:35 +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
Pau Perez
80edfe469c Task to remove limit of ent. that can be created 
It does so by updating a user's enterprise_limit attribute to the
maximum integer the database supports.

This is used at least in Katuma to remove the limitation of the number
of enterprises a user can create. This is the agreement the community
reached for the pricing plans.

Eventually, this logic could be triggered with a button from the UI but
for now this is for internal usage only.
 2019-10-24 15:53:43 +02:00
Pau Perez
b2616d317f Task to remove an unused enterprise 
Note this task is still rather naive and only covers the simple case
where an enterprise was created but never used and thus, does not have
any associated entities like orders.

This is enough for the case I have at hand where a hub's manager created
an enterprise while he wanted to create a user account #ux. He ended up
with an enterprise named after him and now he asked us to clean that up.
 2019-10-24 15:23:54 +02: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
34466c8218 Add order_cycle_id and distributor_id indexes to spree_orders table 2019-10-23 18:29:34 +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
luisramos0
cc342387cc Make all calls to content_for use dash not equals when setting content_for 2019-10-23 12:42:29 +01:00
luisramos0
6715f872e3 Merge duplicated product_sub_menu partials and make all references point to the one located in the spree folder (we keep this one because we still have some views in spree backend referencing this partial 2019-10-23 12:26:18 +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
Dan Ingenthron
40c329ba68 Distinguish between simple create form and full interface in OC feature spec 2019-10-22 17:41:38 -05:00
Dan Ingenthron
3c7af90dfa Revert I18n change and reflect correct required fields on OC form 2019-10-22 17:41:38 -05:00
Dan Ingenthron
241e581779 Add required fields to order cycle spec 2019-10-22 17:41:38 -05:00
Dan Ingenthron
85dede84cc Update order cycle forms & en.yml to include asterisks 2019-10-22 17:41:37 -05: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