Continuous Integration
|
23b9dd5c71
|
Auto-merge from CI [skip ci]
|
2015-12-17 13:02:37 +11:00 |
|
Maikel Linke
|
bc6110c178
|
Re-defining in_distributor scope as method to allow chaining
|
2015-12-17 12:42:28 +11:00 |
|
Rob Harrington
|
e0da49e4df
|
Formatting dates for account invoices in rails time zone
|
2015-12-17 11:34:06 +11:00 |
|
Rob Harrington
|
bac4fcbd8f
|
Make sure that adjustments for billable periods have a valid order to attach to when creating/updating
|
2015-12-16 19:18:59 +11:00 |
|
Rob Harrington
|
ecd11702c3
|
Fixing up enterprise user account page
|
2015-12-16 19:18:59 +11:00 |
|
Rob Harrington
|
fe0652e243
|
When updating a line_item quantity from 0, final_weight_volume is recalculated from the variants unit value
|
2015-12-16 19:18:59 +11:00 |
|
Rob Harrington
|
76d4f74f6b
|
Ammending BillablePeriod spec to be ensure tax is charged correctly
|
2015-12-16 19:18:58 +11:00 |
|
Rob Harrington
|
ca3c464fda
|
Reorganising busines model config settings, moving account invoice tax rate in busines model config settings
|
2015-12-16 19:18:57 +11:00 |
|
Rob Harrington
|
85f61364f8
|
BillablePeriods use global config to calculate bills
|
2015-12-16 19:18:57 +11:00 |
|
Rob Harrington
|
58031408f1
|
Adding basic business model configuration variables to app config
|
2015-12-16 19:18:56 +11:00 |
|
Rob Harrington
|
befc558224
|
Pulling product_and_variant_name down into VariantAndLineItemNaming, renaming to product_and_full_name
Also allowing this method to be used in reports (Xero), to reflect appropriate name for weight/volume adjusted line items
|
2015-12-16 11:55:24 +11:00 |
|
Rob Harrington
|
c91f1301f0
|
Adding preferences to enterprises for sorting of order cycles in shopfront list
|
2015-12-16 11:55:23 +11:00 |
|
Continuous Integration
|
b7edf5e046
|
Auto-merge from CI [skip ci]
|
2015-12-16 10:58:03 +11:00 |
|
Maikel Linke
|
1d46c2febd
|
LettuceShare report: display only if count_on_hand > 0
Use the inventory of a distributor if selected.
|
2015-12-11 15:12:27 +11:00 |
|
Rohan Mitchell
|
80ebaece2d
|
Sort distribution choices by name
|
2015-12-11 13:06:57 +11:00 |
|
Continuous Integration
|
ae945ace9d
|
Auto-merge from CI [skip ci]
|
2015-12-11 11:09:54 +11:00 |
|
Maikel Linke
|
cd7721a127
|
Using date and time of current timezone
Using Time.zone.now and Date.current instead of Time.now and Date.today.
This should make all specs timezone independent.
|
2015-12-10 11:38:41 +11:00 |
|
Rohan Mitchell
|
8d270e919f
|
Sort exchanges for display when editing an order cycle
|
2015-12-10 09:17:25 +11:00 |
|
Rohan Mitchell
|
ea6974d438
|
Add OrderCycle#supplied_variants
|
2015-12-10 09:17:25 +11:00 |
|
Maikel Linke
|
c4fb4a8510
|
Removing Suburbs from the code
Suburbs are not used any more. Removing the last code bits should avoid
confusion and save a tiny bit of test time.
|
2015-12-04 10:37:55 +11:00 |
|
Rohan Mitchell
|
d320b2e7d4
|
Merge branch 'fix-delayed-job' into combined/producer-emails-simplify_fix-delayed-job
|
2015-12-02 15:06:38 +11:00 |
|
Rohan Mitchell
|
bd854bf2dd
|
Remove receival_time from exchange, just use receival_instructions
|
2015-12-02 15:05:49 +11:00 |
|
Rohan Mitchell
|
10edb2b056
|
Fix delayed job startup - prevent error caused by double load
|
2015-12-02 10:48:50 +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
|
a5a886c51f
|
Only test for coordination when orders actually have order_cycles
|
2015-11-25 15:27:27 +11:00 |
|
Rob Harrington
|
7e6b43266f
|
Making sure that price and final_weight_volume can be updated (by distributor or coordinator)
|
2015-11-25 14:23:55 +11:00 |
|
Rob Harrington
|
4bdc1bc418
|
LineItem final_weight_volume is updated whenever quantity is changed, though can be set directly
|
2015-11-18 16:22:36 +11:00 |
|
Rob Harrington
|
75846a4d1f
|
Merge branch 'master' into line_item_naming
|
2015-11-16 10:38:42 +11:00 |
|
Rohan Mitchell
|
a86cc96452
|
Use pluck instead of map
|
2015-11-13 14:03:07 +11:00 |
|
Rohan Mitchell
|
178e5f59e6
|
Update cart by applying differences rather than clear-and-readd every time
|
2015-11-13 14:03:07 +11:00 |
|
Rohan Mitchell
|
7fffa03d8d
|
Fix bug: set difference comparison of string with number
|
2015-11-13 14:03:07 +11:00 |
|
Rohan Mitchell
|
d3c7c46800
|
Add method to remove a variant from an order
|
2015-11-13 14:03:07 +11:00 |
|
Rohan Mitchell
|
c432ed9e08
|
Build list of variants removed from the cart when overwriting
|
2015-11-13 14:03:07 +11:00 |
|
Rohan Mitchell
|
e175149e76
|
Add method to check whether a passed-in cart value varies from the cart
|
2015-11-13 14:03:07 +11:00 |
|
Rohan Mitchell
|
1b5901317d
|
Separate concerns: reading products hash and adding items to cart
|
2015-11-13 14:03:07 +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
|
f499dd627a
|
with_tax_included_in_price handles exceptions gracefully
|
2015-11-11 11:53:04 +11:00 |
|
Rohan Mitchell
|
46a9304ae1
|
Extract compute_tax from EnterpriseFeeApplicator to Spree::TaxRate model
|
2015-11-11 11:53:04 +11:00 |
|
Rohan Mitchell
|
d794981ecf
|
Add form field to set tax when creating adjustment on order. Display tax included in adjustments on order interface.
|
2015-11-11 11:53:04 +11:00 |
|
Rob Harrington
|
2483eef4be
|
WIP: BOM Refactor, removing obsolete OrderCycle.recently_closed scope, ordering closed OCs
|
2015-11-05 14:02:04 +11:00 |
|
Rob Harrington
|
b43049af47
|
WIP: BOM Refactor, building line_item fetch and update logic with ngResource
|
2015-11-04 18:16:17 +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
|
015f3eb9ac
|
Display summary rows for admin adjustments
|
2015-11-01 13:42:59 +11:00 |
|
Rohan Mitchell
|
f63a80300b
|
Merge branch 'master' into folklabs-producer-emails
|
2015-10-29 11:49:24 +11:00 |
|
Rob Harrington
|
18a7317185
|
Merge branch 'account-invoices' into line_item_naming
Conflicts:
app/models/spree/line_item_decorator.rb
|
2015-10-28 13:42:27 +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
|
2d468f5022
|
Fixing attr_accessible for line_items (broken in previous commit)
|
2015-10-28 13:07:31 +11:00 |
|