Rohan Mitchell
f63a80300b
Merge branch 'master' into folklabs-producer-emails
2015-10-29 11:49:24 +11:00
Rob Harrington
40d627cb34
Adding new route for printing an order to pdf
2015-10-16 17:25:40 +11:00
Rob Harrington
6e7fc6a0f7
Adding invoice action to orders controller, to allow sending of invoice email
2015-10-16 17:25:40 +11:00
Rohan Mitchell
ecc3bad8c8
Merge branch 'master' into folklabs-producer-emails
2015-10-16 12:38:54 +11:00
Rohan Mitchell
4fbeb0c3b1
Check if an order is an account invoice
2015-10-15 10:05:27 +11:00
Rohan Mitchell
de80e6d5bf
Find adjustments for billable periods
2015-10-15 09:58:22 +11:00
Rohan Mitchell
92f7b72056
Check whether an individual adjustment has tax included
2015-10-15 09:58:06 +11:00
Rohan Mitchell
7552776349
Add product_and_variant_name display for Variant
2015-09-21 16:49:31 +10:00
Rohan Mitchell
8f40702369
Line items report whether they have tax included
2015-09-21 15:57:04 +10:00
Rob Harrington
2dcbe2b4f2
Updating the admin account view to show use the new account_invoice model to display data
2015-09-17 22:38:29 +10:00
Rob Harrington
13adb61b3a
Refactoring invoice update process to use new AccountInvoice model
2015-09-17 22:38:29 +10:00
Rob Harrington
5eb20fd8cd
Adding tax settings for billing enterprise users
2015-09-17 22:38:13 +10:00
Rob Harrington
6cc403cd92
Preventing double creation of invoices by recognising completed invoices within the specifed period
2015-09-17 22:38:13 +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
92eb5ed367
Adding routes for a new admin account page for users to manage their billing preferences and access invoices
2015-09-17 22:38:10 +10:00
Rob Harrington
160c0d75fe
Confirmation emails do not get send for orders distributed by accounts_distributor
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
311ffc3dc9
wip: user invoice updater finalizes orders on the first of the month
2015-09-17 22:37:56 +10:00
Rob Harrington
ee8a86d495
User model can generate a current invoice for enterprise users
2015-09-17 22:37:56 +10:00
Rob Harrington
fa8c3d65dc
Adding settings for global accounts and billing setup
2015-09-17 22:37:56 +10:00
Rob Harrington
b4e58a1a79
WIP: Basic structure for daily job to update user invoices
2015-09-17 22:37:55 +10:00
Maikel Linke
637e5c4fee
PermalinkGenerator for products
2015-09-16 15:45:10 +10:00
Maikel Linke
326c972f63
Handling nil in final_weight_volume calculation
2015-09-16 10:12:59 +10:00
Continuous Integration
d595e1558a
Auto-merge from CI [skip ci]
2015-08-26 10:03:13 +10:00
Rohan Mitchell
170799f65f
Add permission for hub enterprise users to use xero report #628
2015-08-07 13:37:37 +10:00
Rohan Mitchell
719ddea789
Merge branch 'variable-weights-improvements' of https://github.com/lin-d-hop/openfoodnetwork into lin-d-hop-variable-weights-improvements
2015-08-07 11:10:07 +10:00
Lynne Davis
8639109372
Variable weights improvements additions
2015-08-04 20:13:28 +01:00
Rohan Mitchell
74f90dada3
Allow overriding mobile logo (raster and SVG) and home hero image
2015-07-17 16:06:50 +10:00
Rohan Mitchell
e4a4cdd915
Rewrite alias_method_chain to use super. Ahhhhh :)
2015-07-17 16:06:50 +10:00
Rohan Mitchell
66b4eb4c5d
Move Spree::Preferences::Configuration patches into superclass FileConfiguration
2015-07-17 16:06:50 +10:00
Rohan Mitchell
1d67e3b2b8
Fix image update, display logo on frontend
2015-07-17 16:06:50 +10:00
Rohan Mitchell
1234b35199
Add file handling to Spree::Preferences::Configuration
2015-07-17 16:06:49 +10:00
Lynne Davis
dc95167f15
Adding bits missed from the last commit.
...
Conflicts:
app/controllers/spree/admin/reports_controller_decorator.rb
2015-07-15 14:44:49 +10:00
Rohan Mitchell
7cc2bc4fde
Perform variant override scoping on product/variant by external class. Centralise this so we can load everything in one go.
2015-06-18 13:11:11 +10:00
Rob Harrington
795b2700b4
Merge branch 'master' into enterprise-index-revamp
2015-06-12 12:47:58 +08:00
Rohan Mitchell
2b763271a7
Merge branch 'master' into optimise-shopfront
2015-06-12 12:15:20 +10:00
Rohan Mitchell
4f311543ae
Merge branch 'master' into enterprise-index-revamp
2015-06-12 10:26:11 +10:00
Rob Harrington
1b52564d58
Rerouting welcome page to be an enterprise action, updates to copy for package selection
2015-06-12 01:49:38 +08:00
Rohan Mitchell
d908701b59
Merge branch 'master' into folklabs-producer-emails
...
Conflicts:
Gemfile
2015-06-11 17:02:34 +10:00
Rohan Mitchell
6dea3fa19d
Merge branch 'fix-duplicate-fees' into combined/ginerr_bugfixes_fix-duplicate-fees
2015-06-11 12:56:32 +10:00
Rohan Mitchell
d79129880e
Put lock around adjustment clear/re-create to avoid race condition resulting in duplicate fees
2015-06-10 17:02:30 +10:00
Rohan Mitchell
7412e92665
Merge branch 'master' into optimise-shopfront
2015-06-10 16:39:02 +10:00
Maikel Linke
3c38c8e504
Merge branch 'adjustment-metadata-deletion' into combined/session-store_adjustment-metadata_uglifier
...
Conflicts:
db/schema.rb
2015-06-10 13:56:36 +10:00
Maikel Linke
153360d17b
Let the database delete adjustment metadata
...
GitHub issue #582
We encountered a foreign key violation on adjustment metadata even
though rails should handle that.
Action: order.adjustments.where(originator_type: 'EnterpriseFee').destroy_all
Adjustment: has_one :metadata, class_name: 'AdjustmentMetadata' dependent: :destroy
So we update the foreign key to cause a delete in the database.
2015-06-05 16:10:58 +10:00
Maikel Linke
252e9be016
Merge branch 'remove-old-bugsnag-notification' into combined/xero-report_analytics-bugfixes
2015-06-05 14:23:03 +10:00
Maikel Linke
ffa960b02e
Merge remote-tracking branch 'origin/xero-report' into combined/xero-report_show-order-without-distributor
2015-06-05 13:48:24 +10:00
Maikel Linke
41dafce0db
Remove obsolete Bugsnag notification
2015-06-05 13:46:15 +10:00
Rohan Mitchell
f09fad464e
Merge branch 'master' into optimise-shopfront
2015-06-05 07:28:05 +10:00
Rohan Mitchell
27bc28ffa4
Index variants by id
2015-06-04 12:09:34 +10:00
Rob Harrington
439d122e93
Merge branch 'master' into customers
...
Conflicts:
app/assets/javascripts/admin/bulk_order_management.js.coffee
app/assets/javascripts/admin/bulk_product_update.js.coffee
app/assets/javascripts/admin/directives/line_item_upd_attr.js.coffee
app/views/spree/admin/orders/bulk_management.html.haml
db/schema.rb
spec/javascripts/unit/bulk_order_management_spec.js.coffee
2015-06-03 15:19:40 +08:00
