Rob Harrington a96cdd5ee7 Merge branch 'master' into line_item_naming ...

Conflicts:
	app/views/admin/order_cycles/edit.html.haml

2015-11-13 09:54:26 +11:00

..

reports

Updating reports to use naming information from line_items directly, rather than from the original variant

2015-10-28 13:07:31 +11:00

accounts_and_billing_settings_validator.rb

Adding global settings for controlling automatic scheduling of accounts tasks

2015-09-17 22:38:12 +10:00

bulk_coop_report.rb

Updating reports to use naming information from line_items directly, rather than from the original variant

2015-10-28 13:07:31 +11:00

customers_report.rb

On customer reports, do not show orders through a hub that the current user does not manage

2014-06-19 10:35:32 +10:00

distribution_change_validator.rb

Rename OrderCycle#distributed_variants_by to variants_distributed_by

2013-11-15 14:34:05 +11:00

enterprise_fee_applicator.rb

Extract compute_tax from EnterpriseFeeApplicator to Spree::TaxRate model

2015-11-11 11:53:04 +11:00

enterprise_fee_calculator.rb

SELECT DISTINCT results in inconsistent #count value. Work around this with to_a.

2015-08-05 11:05:29 +10:00

enterprise_injection_data.rb

Only load activated relatives for EnterpriseInjectionData

2015-05-29 12:08:21 +10:00

feature_toggle.rb

Enable order cycles by default

2013-11-29 10:49:33 +11:00

group_buy_report.rb

Revert "Renaming options_text to unit_text so that we can use method from included VariantAndLineItemNaming module"

2015-10-28 13:08:50 +11:00

integrity_checker.rb

Add reactive integrity test that soft-deleted variants are removed from order cycles

2014-06-12 14:59:27 +10:00

lettuce_share_report.rb

Handling tax categories without tax rates

2015-08-21 15:16:00 +10:00

locking.rb

Change locking to use postgres syntax, fixes 'must be first statement in transaction' error

2015-02-20 11:31:39 +11:00

model_class_from_controller_name.rb

Rename OpenFoodWeb namespace to OpenFoodNetwork

2013-10-18 17:29:55 +11:00

option_value_namer.rb

Split variant name into number and unit columns

2015-07-23 12:22:30 +10:00

order_and_distributor_report.rb

Revert "Renaming options_text to unit_text so that we can use method from included VariantAndLineItemNaming module"

2015-10-28 13:08:50 +11:00

order_cycle_form_applicator.rb

Fix OrderCycleFormApplicator specs

2015-04-29 15:00:22 +10:00

order_cycle_management_report.rb

Adding tweaks that have been missed from merges

2015-10-30 11:54:06 +11:00

order_cycle_permissions.rb

Fixing bug on OC interface that prevented hubs from pulling their own products through

2015-06-03 16:18:44 +08:00

order_grouper.rb

Revert "Add a blank row after summary row in all reports"

2015-07-24 12:40:42 +10:00

orders_and_fulfillments_report.rb

Updating reports to use naming information from line_items directly, rather than from the original variant

2015-10-28 13:07:31 +11:00

packing_report.rb

Merge branch 'master' into line_item_naming

2015-11-12 14:40:11 +11:00

paperclippable.rb

Admin can upload logo for ContentConfig

2015-07-17 16:06:49 +10:00

payments_report.rb

Cherry-pick 00927f7: Refactoring to move bulk out of reports_controller_decorator

2015-07-22 15:25:12 +10:00

permalink_generator.rb

PermalinkGenerator for products

2015-09-16 15:45:10 +10:00

permissions.rb

WIP: BOM Refactor, adding for_line_items action to enterprises controller

2015-11-04 15:02:29 +11:00

products_and_inventory_report_base.rb

Add first cut of LettuceShare report

2015-08-07 10:37:59 +10:00

products_and_inventory_report.rb

Add first cut of LettuceShare report

2015-08-07 10:37:59 +10:00

rack_request_blocker.rb

JS feature specs completing before cleaning db

2015-09-16 15:38:09 +10:00

referer_parser.rb

Handle invalid referer URLs

2015-06-05 12:43:49 +10:00

sales_tax_report.rb

Consistency in tax calculations, remove some unneeded local vars

2015-03-25 16:31:15 +11:00

scope_product_to_hub.rb

Fetch indexed variant overrides in one go

2015-06-18 15:03:24 +10:00

scope_variant_to_hub.rb

When an on-demand variant has overridden stock levels, make it not on-demand

2015-07-16 10:05:07 +10:00

spree_api_key_loader.rb

Assigning @spree_api_key for store

2014-09-19 18:31:33 +10:00

user_balance_calculator.rb

Extract most everything to private methods - neatly groups concerns together

2015-01-09 11:28:39 +11:00

users_and_enterprises_report.rb

Adding visible to user and enterprises report, and sorting by confirmation date

2015-01-29 10:46:44 +11:00

variant_and_line_item_naming.rb

Revert "Renaming options_text to unit_text so that we can use method from included VariantAndLineItemNaming module"

2015-10-28 13:08:50 +11:00

xero_invoices_report.rb

Display detail rows for admin adjustments

2015-11-01 15:19:03 +11:00