Em-AK
fcc328f00a
Display default xero invoice dates
...
fixes #682
* pre-fill the invoice_date and due_date in the xero report generation form
* increase the default period between invoice_date and due_date to 1 month in
XeroInvoiceReport
2015-12-13 16:42:32 +01:00
Rohan Mitchell
5579fa5e0b
Extract last used address finding into service object
2015-12-11 13:06:59 +11:00
Rohan Mitchell
9d5606a4fd
Fix enterprise index page 500
2015-12-11 10:06:07 +11:00
Rohan Mitchell
1e397a41ae
Refactor to simplify outgoing_exchange_variant_ids
2015-12-10 09:17:25 +11:00
Rohan Mitchell
243ef4ee16
When an outgoing exchange includes a variant that is not in an incoming exchange, remove it from the outgoing exchange
2015-12-10 09:17:25 +11:00
Rohan Mitchell
8c0a82f26f
Provide issues summary for enterprises, pass enterprises through to controller
2015-12-10 09:17:25 +11:00
Rohan Mitchell
93c42d24c7
Extract issue detection into service object
2015-12-10 09:17:25 +11:00
Rohan Mitchell
bd854bf2dd
Remove receival_time from exchange, just use receival_instructions
2015-12-02 15:05:49 +11:00
Rob H
baeacfb8a9
LineItem inherits display_name from variant
...
Allows line_items to be named correctly.
2015-11-29 17:25:28 +11:00
Rob Harrington
75846a4d1f
Merge branch 'master' into line_item_naming
2015-11-16 10:38:42 +11:00
Maikel Linke
5d5fda3a25
Merge remote-tracking branch 'origin/master' into i18n
...
Conflicts:
config/locales/en.yml
2015-11-13 10:07:29 +11:00
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
Rob Harrington
be8038e9d0
Merge branch 'master' into line_item_naming
...
Conflicts:
lib/open_food_network/order_cycle_management_report.rb
lib/open_food_network/packing_report.rb
2015-11-12 14:40:11 +11:00
Rohan Mitchell
e20d8d3e95
Merge branch 'master' into folklabs-producer-emails
2015-11-11 14:20:25 +11:00
Rohan Mitchell
46a9304ae1
Extract compute_tax from EnterpriseFeeApplicator to Spree::TaxRate model
2015-11-11 11:53:04 +11:00
Maikel Linke
8b29612614
Merge remote-tracking branch 'origin/master' into i18n
2015-11-05 11:54:06 +11:00
Rob Harrington
ae7e744644
WIP: BOM Refactor, adding for_line_items action to enterprises controller
2015-11-04 15:02:29 +11:00
Rohan Mitchell
a3d638df67
Merge branch 'master' into folklabs-producer-emails
2015-11-04 11:15:01 +11:00
Rohan Mitchell
9227df54b6
Display detail rows for admin adjustments
2015-11-01 15:19:03 +11:00
Rohan Mitchell
015f3eb9ac
Display summary rows for admin adjustments
2015-11-01 13:42:59 +11:00
Lynne Davis
7350dbb75e
Adding tweaks that have been missed from merges
2015-10-30 11:54:06 +11:00
Rob Harrington
ab7bfd10c5
Revert "Renaming options_text to unit_text so that we can use method from included VariantAndLineItemNaming module"
...
This reverts commit e86e08b72e939fee61eddd41d56081395666a877.
Conflicts:
lib/open_food_network/order_and_distributor_report.rb
spec/features/admin/variants_spec.rb
spec/lib/open_food_network/order_and_distributor_report_spec.rb
2015-10-28 13:08:50 +11:00
Rob Harrington
a71999ba84
Weight only returned for products whose variant_unit is 'weight'
2015-10-28 13:07:31 +11:00
Rob Harrington
eba13a0dd7
Line items inherit units from variants upon creation
2015-10-28 13:07:31 +11:00
Rob Harrington
40972cc6ec
Updating reports to use naming information from line_items directly, rather than from the original variant
2015-10-28 13:07:31 +11:00
Rob Harrington
795830d94d
Renaming options_text to unit_text so that we can use method from included VariantAndLineItemNaming module
2015-10-28 13:07:31 +11:00
Rob Harrington
039fcb80eb
Extracting variant and option_value naming out into a lib class that is now shared between line items and variants, line_items have option_values
2015-10-28 13:06:10 +11:00
Maikel Linke
2053fbecda
Merge branch 'i18n-replace-strings-in-js' into i18n
...
Conflicts:
.travis.yml
app/views/spree/order_mailer/confirm_email_for_customer.html.haml
config/locales/en.yml
2015-10-21 14:09:43 +11:00
Rohan Mitchell
ecc3bad8c8
Merge branch 'master' into folklabs-producer-emails
2015-10-16 12:38:54 +11:00
Rohan Mitchell
13fc36bad6
Reorder methods
2015-10-15 12:00:40 +11:00
Rohan Mitchell
a766f007fc
Display xero report for account invoices
2015-10-15 11:57:51 +11:00
Maikel Linke
1751a95909
place I18n init at right place in karma task
2015-10-09 11:40:12 +11:00
Maikel Linke
bd737ef727
I18n object file for karma
2015-10-01 16:38:47 +10:00
Rohan Mitchell
9c6264c4a0
On detailed xero report, do not show product totals (xero treats them as additional line items)
2015-09-25 13:52:51 +10:00
Rohan Mitchell
10bc3919ca
Add SKU to detailed xero report
2015-09-22 09:28:50 +10:00
Rohan Mitchell
b5bc4701fa
Detailed xero report
2015-09-22 09:15:55 +10:00
Rob Harrington
ae30007fed
Redesignating all references to user_invoices as account_invoices
2015-09-17 22:38:28 +10:00
Rob Harrington
448bd12e9f
Adding billing tasks to whenever schedule
2015-09-17 22:38:12 +10:00
Rob Harrington
6665f9b4a0
Adding global settings for controlling automatic scheduling of accounts tasks
2015-09-17 22:38:12 +10:00
Rob Harrington
c2c0c3684d
Refactoring accounts and billing settings controller, adding start_job action
2015-09-17 22:38:09 +10:00
Rob Harrington
2048800c43
Billable periods updater does not auto-run user invoices updater
2015-09-17 22:38:09 +10:00
Rob Harrington
e6f6a3ad81
Commenting out global configs for nightly job switches, use a button to manually run jobs instead (for now)
2015-09-17 22:38:09 +10:00
Rob Harrington
e3e59d76a9
Adding global config for setting default payment and shipping methods for accounts distributor
2015-09-17 22:38:08 +10:00
Rob Harrington
fa8c3d65dc
Adding settings for global accounts and billing setup
2015-09-17 22:37:56 +10:00
Maikel Linke
637e5c4fee
PermalinkGenerator for products
2015-09-16 15:45:10 +10:00
Maikel Linke
2488411b94
JS feature specs completing before cleaning db
...
Some specs ran into a deadlock when the Database::Cleaner tried to do
its job while AJAX requests were still triggering other actions.
2015-09-16 15:38:09 +10:00
Maikel Linke
e25805aa78
Restoring all changes of the last combined branch
...
This reverts commit 1e55e8a907
2015-09-10 15:03:13 +10:00
Maikel Linke
1e55e8a907
Reverting all changes of the last combined branch
...
The production server hangs on certain requests. To rule out a code bug,
we revert to the last deployed version.
2015-09-10 12:50:40 +10:00
Maikel Linke
2e2e767564
always displaying group_buy_unit_size
2015-09-09 12:22:28 +10:00
Maikel Linke
0fdd000589
Showing Bulk Unit Size in BulkCoopReport
...
The group_buy_unit_size field is now shown even if 'group buy' is not
enabled. And "Group By Unit Size" is now displayed as "Bulk Unit Size".
2015-09-03 12:26:40 +10:00
