Maikel Linke
993183f2f5
updating js spec: cloning product calls insertProductAfter now
2015-05-01 15:04:12 +10:00
Rohan Mitchell
e91de69d5a
Merge branch 'master' into pin-refunds
2015-05-01 14:58:19 +10:00
Rohan Mitchell
03ae740cd6
Revert "Display header for Xero invoices report"
...
This reverts commit a6cecdcc25
2015-05-01 14:55:26 +10:00
summerscope
d9fd0b284d
WIP on home panes and layout
2015-05-01 14:52:17 +10:00
Maikel Linke
7c55285708
Merge branch 'master' of github.com:openfoodfoundation/openfoodnetwork into single-order-patches
2015-05-01 14:50:51 +10:00
Maikel Linke
e6e063670c
Allow managers to remove line items from order
...
Managers of an order cycle and the distributor of an order are allowed to
remove a line item from the order.
2015-05-01 14:49:34 +10:00
summerscope
e1beae98ab
WIP on redesign / layout job
...
> adding in new design assets
> copy and layout for homepage partials
> more global styling updates
2015-05-01 14:41:48 +10:00
Rohan Mitchell
153604dd64
Merge branch 'single-order-patches'
2015-05-01 14:39:17 +10:00
Maikel Linke
b7bac326bd
admin order edit: re-label update button to "update and recalculate fees"
2015-05-01 12:05:43 +10:00
Rohan Mitchell
a6cecdcc25
Display header for Xero invoices report
2015-05-01 11:59:52 +10:00
Maikel Linke
baabb5c07f
fixing BPE feature spec
2015-05-01 11:30:26 +10:00
Rohan Mitchell
91ca5f0213
Fix specs for receival_time / instructions
2015-05-01 10:08:24 +10:00
Rohan Mitchell
f5b45fa0ba
Merge branch 'master' into folklabs-producer-emails
2015-05-01 09:51:01 +10:00
summerscope
427f535026
Redesign big chunk of work:
...
> setting up pages for Shops, and shops signup, producers signup
> setting up routes for new pages
> changing fonts to Google Oswald & Roboto
> setting up homepage partials and removing partials no longer required
> changing menu links and labels
2015-04-30 18:20:17 +10:00
summerscope
ae16589717
New version of logo sliced for OFN Australia
2015-04-30 17:55:18 +10:00
Maikel Linke
66f847f673
showing save button at the bottom as well
2015-04-30 17:22:54 +10:00
Maikel Linke
af78859db6
Merge remote-tracking branch 'origin/master' into single-order-patches
2015-04-30 17:18:02 +10:00
Maikel Linke
295da25dd2
insert clone after cloned product
2015-04-30 17:17:28 +10:00
Maikel Linke
5efc0a5110
quick fix: update fees after updating order
2015-04-30 16:29:51 +10:00
Rohan Mitchell
2c7a5c0656
Update Spree - fixes bug where Payment#method_missing depends on #provider already called.
2015-04-30 15:49:48 +10:00
Rohan Mitchell
0b652a2113
Add refund icon
2015-04-30 15:49:48 +10:00
Rohan Mitchell
b498c28632
Payments can be refunded
2015-04-30 15:49:48 +10:00
Rohan Mitchell
8184a7c7b2
Pin payments can't void or credit, but they can refund
2015-04-30 15:49:48 +10:00
Rohan Mitchell
b09ae550c8
Add spec for payment actions
2015-04-30 15:49:48 +10:00
Rohan Mitchell
f4df227ef0
Buildkite should now support Fuubar
2015-04-30 13:54:27 +10:00
Rohan Mitchell
a207f50aeb
Merge branch 'master' into delay-devise-emails
...
Conflicts:
script/run_tests.sh
2015-04-30 12:29:06 +10:00
Rohan Mitchell
73376b30e2
Convention
2015-04-29 15:56:27 +10:00
Rohan Mitchell
3565548e91
Extract data preparation into private methods
2015-04-29 15:50:42 +10:00
Rohan Mitchell
6999bcfd4e
Only include complete orders in producer mailer report
2015-04-29 15:43:50 +10:00
Rohan Mitchell
2fe5d7c73f
Remove commented code, use neater syntax for accessing Spree config var
2015-04-29 15:33:39 +10:00
Rohan Mitchell
3a3bf19cf8
Clean up duplication
2015-04-29 15:31:42 +10:00
Rohan Mitchell
30e04b509d
Clean up routes
2015-04-29 15:31:13 +10:00
Rohan Mitchell
4279742de5
Avoid serialising entire order cycle when enqueuing OrderCycleNotificationJob
2015-04-29 15:21:05 +10:00
Rohan Mitchell
713c93a570
Fix OrderCycleFormApplicator specs
2015-04-29 15:00:22 +10:00
Rohan Mitchell
36584f0177
Remove puts from specs, fix failing controller spec
2015-04-29 14:46:20 +10:00
Rohan Mitchell
6b1c125b03
Merge branch 'producer-emails' of https://github.com/folklabs/openfoodnetwork into folklabs-producer-emails
...
Conflicts:
Gemfile.lock
app/controllers/admin/order_cycles_controller.rb
app/views/admin/order_cycles/edit.html.haml
app/views/admin/order_cycles/show.rep
db/schema.rb
spec/controllers/admin/order_cycles_controller_spec.rb
2015-04-29 14:42:17 +10:00
Maikel Linke
ecf635e080
handle missing bill_address on admin order page
2015-04-29 14:32:13 +10:00
Maikel Linke
2e66a082eb
add customer notes to admin order index page
2015-04-29 14:31:59 +10:00
Rob Harrington
992fb2347d
Merging master branch into require_standard_variant
2015-04-29 14:30:49 +10:00
Rohan Mitchell
3b61d7a1e0
Add ref for country ISO codoes
2015-04-29 14:12:08 +10:00
Rohan Mitchell
c3f99d7540
Merge branch '441-default-country' of https://github.com/folklabs/openfoodnetwork into folklabs-441-default-country
2015-04-29 14:07:58 +10:00
Maikel Linke
f6d87eee87
Merge remote-tracking branch 'origin/master' into single-order-patches
2015-04-29 13:20:44 +10:00
Maikel Linke
e82a3a9d82
add ship button to admin order index page
2015-04-29 12:30:05 +10:00
Maikel Linke
8511bd19ce
add ship button to order edit page
2015-04-29 12:03:49 +10:00
Maikel Linke
1268108877
handle ship event on order
2015-04-29 12:03:11 +10:00
Maikel Linke
2b0f867ed8
new order method ready_to_ship?
2015-04-29 11:42:35 +10:00
Rob Harrington
a253b88525
Fixing line item controller spec
2015-04-29 10:42:38 +10:00
Paul Mackay
0f1ec17698
#275 : Use better path variable in test.
2015-04-28 16:08:26 +01:00
Lynne Davis
9e61a7d083
Adding report type drop down to order_cycle_management_report
2015-04-26 11:03:32 +01:00
Lynne Davis
6bbd3f7c13
Added auth for order_cycle_management_report. This report was breaking supplier enterprises reports due to incorrect authorization.
2015-04-26 11:02:06 +01:00
