10746 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
luisramos0	bfa0734cc6	Break order_cycle_spec.js in specific files like create controller, edit controller and services ... Move bulk_product_update_spec.js to its apropriate place under /admin	2019-02-14 15:57:40 +00:00
Maikel	a36dc13192	Add issue templates for tech debt	2019-02-13 17:26:56 +11:00
Pau Pérez Fabregat	bda5eb1b1f	Merge pull request #3337 from kristinalim/feature-enterprise_fees_report-order_based_calculator_bug ... 3283 [Enterprise Fee Summary] Fix values when calculator is order-based	2019-02-12 20:07:57 +01:00
Kristina Lim	5e8a336e24	Initialize data representation classes with data ... There is no more need to pass the summarizer.	2019-02-13 01:51:34 +11:00
Kristina Lim	ddc788ed5d	Move data representation translations to class	2019-02-13 01:51:34 +11:00
Kristina Lim	bc95560598	Add descriptions for data representation classes	2019-02-13 01:51:33 +11:00
Kristina Lim	664943a6e5	Include UsingEnterpriseFee instead of inheriting	2019-02-13 01:51:33 +11:00
Kristina Lim	b9c144bb1f	Prepare to change AssociatedEnterpriseFee to module ... The superclasses will include this module, instead of inheriting the class.	2019-02-13 01:51:32 +11:00
Kristina Lim	373e3e1039	Simplify name of SQL data summarizer class	2019-02-13 01:51:32 +11:00
Kristina Lim	7a76355cfe	Separate summarizing of SQL data by source	2019-02-13 01:51:32 +11:00
Kristina Lim	c4801aafd4	Fix Fee Calc on Transfer Through and Tax Category ... For exchange fees with calculator that is order-based: * "Fee Calc on Transfer Through" should show "Entire Orders through DISTRIBUTOR_NAME". * For tax category: a. If the enterprise fee itself has a tax category, this is used. b. If the enterprise fee inherits the product's tax category, this is "Various". c. If the enterprise fee has no tax, this is blank. For coordinator fees: * "Fee Calc on Transfer Through" should be "All". * For tax category: Same as abova.	2019-02-13 01:51:31 +11:00
Kristina Lim	8f65beeb0b	Clarify method name in report scope	2019-02-13 01:51:31 +11:00
Kristina Lim	e550be9bda	Add test for using order-based exchange fees ... This is not filling the "Fee Calc on Transfer Through" column. This will be addressed in another commit.	2019-02-13 01:51:31 +11:00
Kristina Lim	0212454041	Refactor SQL result summarizer for report	2019-02-13 01:51:30 +11:00
Kristina Lim	06ba5182b4	Add flat rate calculator traits to related factories	2019-02-13 01:51:30 +11:00
Pau Pérez Fabregat	1f72eb9f68	Merge pull request #3378 from kevinchristianson/active-products-translation-fix ... Add missing 'active products' translation on dashboard	2019-02-12 14:15:53 +01:00
Pau Pérez Fabregat	a0c144fd0c	Merge pull request #3415 from openfoodfoundation/feature/enterprise_fee_summary ... [Enterprise Fee Summary] Merge "Enterprise Fee Summary" report to master	2019-02-12 13:58:47 +01:00
Pau Pérez Fabregat	a6c5e3423f	Merge pull request #3474 from Matt-Yorkley/pi/broken_build ... Fix broken spec from refactored method	2019-02-12 11:03:28 +01:00
Matt-Yorkley	097ffba323	Fix broken spec from refactored method	2019-02-11 23:57:13 +00:00
Pau Pérez Fabregat	4165ba5cdb	Merge pull request #3463 from coopdevs/enable-catalan ... Import Catalan translation from Transifex	2019-02-11 18:13:50 +01:00
Pau Perez	990de63728	Merge branch 'master' into active-products-translation-fix ... * master: (46 commits) Wait for button to disappear before checking flash Use flash matcher in shipping method feature specs Add RSpec matchers for flash messages Do not expect modal open when checking spinner gone Update issue templates Update all locales with the latest Transifex translations Do not show table until first time dereferencing is done Remove unused have_no_selector argument in feature test Compile row ID with higher priority Compile edit link with higher priority Support selecting date in next months Improve sync between keyword filter and selecting all Wait for datepicker to associate and open before selecting date Update cancan permissions for second iteration of bulk invoices Fix shop accidentally becoming order coordinator Match date format in spec with import date filter Update name spaces for rake tasks to shorter 'ofn'. Refactor checking no preview image in specs Refactor checking of preview image path in specs Fix race condition in enterprise image feature specs ...	2019-02-11 16:12:52 +01:00
Pau Pérez Fabregat	9d065c8a0b	Merge pull request #3233 from Matt-Yorkley/pi/inventories ... Pi/inventories	2019-02-11 16:10:33 +01:00
Pau Pérez Fabregat	da09c8f86c	Merge pull request #3467 from kristinalim/fix/3455-intermittent_spec_failure ... 3455 [Flaky Spec] Do not expect modal still open when checking that the spinner is gone	2019-02-11 15:58:22 +01:00
Pau Pérez Fabregat	b508d51406	Merge pull request #3469 from kristinalim/fix/3468-intermittent_spec_failures ... 3468 [Flaky Spec] Check for presence of flash div before trying to get its text	2019-02-11 15:54:33 +01:00
Kristina Lim	0032a237a2	Wait for button to disappear before checking flash	2019-02-10 22:08:18 +08:00
Kristina Lim	175264f41f	Use flash matcher in shipping method feature specs	2019-02-10 22:08:18 +08:00
Kristina Lim	e14c60c1c1	Add RSpec matchers for flash messages	2019-02-10 22:08:18 +08:00
Kristina Lim	f143540d0c	Do not expect modal open when checking spinner gone ... The element referenced in the following might no longer be visible: within "div.reveal-modal"	2019-02-09 22:40:40 +08:00
Kristina Lim	b6be8c48d1	Fix layout violation in Spree::Ability decorator	2019-02-08 21:26:39 +00:00
Kristina Lim	de30cf1198	Fix description for feature flag example groups	2019-02-08 21:26:39 +00:00
Kristina Lim	461b5725d1	Hide report link and resource from non-superadmins	2019-02-08 21:26:38 +00:00
Kristina Lim	1d3f4aa28a	Add feature flag for enterprise fee summary	2019-02-08 21:26:38 +00:00
Kristina Lim	f59834ddc8	Use receiver as "Fee Calc on Transfer Through" for outgoing exchanges	2019-02-08 21:26:38 +00:00
Kristina Lim	ddf15f1d30	Add scenario test for enterprise fee summary ... Add test for more complex scenario where there is a coordinator and distributor fee for an incoming exchange, and a producer and coordinator fee for an outgoing exchange.	2019-02-08 21:26:38 +00:00
Kristina Lim	c92d202612	Rename files for factories in spec/factories/ ... Make these follow the "#{SINGULAR_OBJECT}_factory.rb" convention.	2019-02-08 21:26:38 +00:00
Kristina Lim	625069cb5a	Add :per_item factory trait to shipping and payment methods	2019-02-08 21:26:38 +00:00
Kristina Lim	d2e49b8b49	Move variant setup to new factory trait	2019-02-08 21:26:38 +00:00
Kristina Lim	f36d13a736	Rename helper for setting up incomplete order	2019-02-08 21:26:38 +00:00
Kristina Lim	ce030aeb07	Move order setup to new factory traits	2019-02-08 21:26:38 +00:00
Kristina Lim	a3aa594c42	Use enterprise fee factory trait where applicable	2019-02-08 21:26:38 +00:00
Kristina Lim	5dda3b67eb	Use factory for tax category in entperprise fee summary tests	2019-02-08 21:26:38 +00:00
Kristina Lim	61ec43f868	Add enterprise fee factory trait for per item rate ... We should not presume what is not default for an enterprise fee object.	2019-02-08 21:26:38 +00:00
Kristina Lim	53c458f817	Clean up setup data for enterprise fee summary tests	2019-02-08 21:26:38 +00:00
Kristina Lim	4a73b1d26c	Do not include incomplete orders in report	2019-02-08 21:26:38 +00:00
Kristina Lim	eaa7800427	Do not assign I18n translation to constants ... The preferred language could change dynamically.	2019-02-08 21:26:38 +00:00
Kristina Lim	6378afdddb	Address Rubocop violation	2019-02-08 21:26:38 +00:00
Kristina Lim	c81be75530	Move engine libraries except Engine and Version to services	2019-02-08 21:26:38 +00:00
Kristina Lim	3e499faa7c	Do not use ReportData::EnterpriseFeeTypeTotals	2019-02-08 21:26:38 +00:00
Kristina Lim	3f84d0008a	Move some in OpenFoodNetwork to engine services ... This removes the OpenFoodNetwork namespace from these too.	2019-02-08 21:26:38 +00:00
Kristina Lim	95e3a2f45d	Move authorization to the ::Parameters class	2019-02-08 21:26:38 +00:00