Rob Harrington
6769c2c729
Can pass params for order or line items into LineItemsController#index
2015-11-05 17:07:47 +11:00
Rob Harrington
afef9e3211
WIP: BOM Refactor, building order_cycle fetch and update logic with ngResource
2015-11-05 15:13:19 +11:00
Rob Harrington
a9e5f2912f
WIP: Fixing Orders service specs
2015-11-05 14:48:26 +11:00
Rob Harrington
66d1e4297e
WIP: Renaming admin.order_cycles to admin.orderCycles for consistency
2015-11-05 14:40:42 +11:00
Rob Harrington
4d4e2d4abd
WIP: Moving order_cycle controller into order_cycles folder
2015-11-05 14:38:01 +11:00
Rob Harrington
db4e8382e4
Oops, updating template to make order filtering work
2015-11-05 14:05:14 +11:00
Rob Harrington
51762753f4
WIP: BOM Refactor, adding json route for OrderCyclesController#index, loading OCs based on show_more or specific order_close_at_gt
2015-11-05 14:04:29 +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
e96fa967b8
WIP: BOM refactor, rebuilding bulk orders controller as line items controller using new AJAX routes
2015-11-05 11:54:36 +11:00
Rob Harrington
50a551a87e
Coffeescript!
2015-11-04 18:35:14 +11:00
Rob Harrington
1494389d34
WIP: BOM Refactor, organising admin.products files in appropriate folders
2015-11-04 18:28:53 +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
f563f04f1c
WIP: BOM Refactor, building order fetch and update logic with ngResource, updating rails routes
2015-11-04 16:35:56 +11:00
Rob Harrington
ae7e744644
WIP: BOM Refactor, adding for_line_items action to enterprises controller
2015-11-04 15:02:29 +11:00
Rob Harrington
625e0888ea
Adding logic to Admin::BaseController to standardise rendering of data with AMS
2015-11-04 12:10:50 +11:00
Rob Harrington
02423d3a41
Using rails time zone account invoice job specs
2015-10-28 16:51:18 +11:00
Rob Harrington
cb1f79f59a
Updating front end order details, invoices and pdfs to display names of line_items as opposed to variants
2015-10-28 15:42:14 +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
c5810fc003
Improving BOM form validation
2015-10-28 13:08:50 +11:00
Rob Harrington
f60b6994eb
Wrapping line_item update with order.update_distribution_charge inside lock
2015-10-28 13:08:50 +11:00
Rob Harrington
50b3635e7e
Locking line_items on API update
2015-10-28 13:08:50 +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
cdb0c2db33
Admin Orders show page uses line_item.full_name to describe line_items
2015-10-28 13:07:32 +11:00
Rob Harrington
21e5895a8a
Group Buy panel on BOM takes changes to final_weight_volumes into account
2015-10-28 13:07:32 +11:00
Rob Harrington
33e1322a44
Adding form validation to BOM
2015-10-28 13:07:32 +11:00
Rob Harrington
b08556ec7f
WIP: Making final_weight_volume adjustment a bit nicer
2015-10-28 13:07:31 +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
2d468f5022
Fixing attr_accessible for line_items (broken in previous commit)
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
1946bac8e4
Fixing report spec that cares about table title case
2015-10-28 13:07:31 +11:00
Rob Harrington
e52f7165c3
Overriding any last references to options_text in the spree codebase
2015-10-28 13:07:31 +11:00
Rob Harrington
6dfae1b014
Whitespace crusader
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
Rob Harrington
6a70c162bb
Account invoice jobs run according to rails config time zone rather than system time zone
2015-10-23 12:33:05 +11:00
Maikel Linke
0fd29dd32e
use expect in bulk_order_management_spec
2015-10-22 13:43:15 +11:00
Maikel Linke
dc8166ec84
New CI script to check test state via GitHub API
2015-10-21 16:29:41 +11:00
Rob Harrington
ef08977dbe
Prevent invoices from being sent unless the distributor of an order has set their ABN
2015-10-21 16:23:48 +11:00
Rob Harrington
9b2653aa2d
Updating order invoice template to be more legally compliant
2015-10-21 15:52:14 +11:00
Maikel Linke
adf0a84669
Use ! version of find_by_permalink to recover on missing resource
2015-10-21 15:42:28 +11:00
Maikel Linke
6781051fe6
enabling Travis container-based infrastucture
2015-10-21 10:27:16 +11:00
Maikel Linke
2357f46a4e
CI scripts use env vars
...
The CI scripts are configurable through the environment. They had
hardcoded configurations before. The Australian BuildKite setup will
need global environment variables like this:
STAGING_SSH_HOST=ofn-staging2
STAGING_CURRENT_PATH=/home/openfoodweb/apps/openfoodweb/current
STAGING_SERVICE=unicorn_openfoodweb
STAGING_DB_HOST=localhost
STAGING_DB_USER=openfoodweb
STAGING_DB=openfoodweb_production
PRODUCTION_REMOTE=production:/home/openfoodweb/apps/openfoodweb/current
2015-10-21 10:04:29 +11:00
Maikel Linke
8bd78eb139
spec_helper for lib/open_food_network/permissions_spec.rb
2015-10-21 10:04:29 +11:00
Maikel Linke
f152e4054c
Remove obsolete deface
2015-10-21 10:04:29 +11:00
Maikel Linke
62d31f79ed
Remove obsolete deface
2015-10-21 10:04:28 +11:00
Maikel Linke
2ea1a59666
depricating db2fog.rb initializer due to invalid bucket name
...
Once everybody changed their server config, we can remove that file.
2015-10-21 10:04:28 +11:00
Maikel Linke
a95727b376
running all specs in Travis
2015-10-21 10:04:28 +11:00
Maikel
b35df3c945
Travis config for parallel execution on five nodes
...
This Travis configuration runs rspec on five build machines in parallel. Currently, that takes 15 to 20 minutes.
2015-10-21 10:04:28 +11:00
Rob Harrington
5b3e052f78
Using a compiled stylesheet for pdf styling
2015-10-16 21:36:18 +11:00
