Rob Harrington
|
1c03e27686
|
Moving dropdown to its own folder
|
2015-05-13 12:44:33 +10:00 |
|
Rob Harrington
|
7a4f0e214c
|
Adding customers index view
|
2015-05-13 12:44:33 +10:00 |
|
Rob Harrington
|
307302038a
|
Adding customers controller, service and resource
|
2015-05-13 12:44:33 +10:00 |
|
Rob Harrington
|
b3d314cfdb
|
Adding require line for index_utils module to all.js
|
2015-05-13 12:44:32 +10:00 |
|
Rob Harrington
|
b6d63d40c6
|
Pulling columns logic out into its own services/controller in a new indexUtils module
|
2015-05-13 12:44:32 +10:00 |
|
Rob Harrington
|
220f42fcf2
|
Customers controller serializes data for json requests, just renders view without data for html
|
2015-05-13 12:44:32 +10:00 |
|
Rob Harrington
|
37ff61d663
|
Adding basic routing to display customer index page
|
2015-05-13 12:44:32 +10:00 |
|
Rob Harrington
|
57dbc33a7b
|
Adding resource service to determine submission request based on object type
|
2015-05-13 12:44:31 +10:00 |
|
Rob Harrington
|
b16fa9cdc1
|
Generalising datasubmitter pendingChanges and watcher directive
|
2015-05-13 12:44:31 +10:00 |
|
Rob Harrington
|
30bb948d35
|
Making ofn-line-item-upd-attr work without ng-model
Conflicts:
app/assets/javascripts/admin/directives/line_item_upd_attr.js.coffee
app/views/spree/admin/orders/bulk_management.html.haml
|
2015-05-13 12:44:31 +10:00 |
|
Rohan Mitchell
|
d9404d3332
|
Merge branch 'master' into single-order-patches
|
2015-05-06 17:29:23 +10:00 |
|
Rohan Mitchell
|
e43d726b97
|
Merge branch 'master' into payments-report-fix
|
2015-05-06 14:55:10 +10:00 |
|
Rob Harrington
|
8788322492
|
Alllowing payments in payment reports to access soft-deleted payment methods
|
2015-05-06 11:10:50 +10:00 |
|
Rick Giner
|
368402f115
|
Changed selectors' ng-repeat. Using existing variable instead of method call
|
2015-05-03 15:24:16 +10:00 |
|
Rick Giner
|
9e70c80d1d
|
bind-once in product modal
|
2015-05-03 14:48:27 +10:00 |
|
Rick Giner
|
8fb11defdb
|
bind-once in groups home page
|
2015-05-03 14:41:34 +10:00 |
|
Rick Giner
|
9c26b3ebb2
|
bind-once in partials
|
2015-05-03 14:34:42 +10:00 |
|
Rick Giner
|
3fc616cdff
|
bind-once on hubs
|
2015-05-03 14:11:09 +10:00 |
|
Rick Giner
|
16e9f0545b
|
bind-once in products
|
2015-05-03 14:02:33 +10:00 |
|
Rick Giner
|
a3664d4448
|
Added bindonce and ng-if improvements to Producers templates
|
2015-05-03 12:51:59 +10:00 |
|
Maikel Linke
|
11acb3ba59
|
Allow to remove adjustments
Managers of an order cycle and the distributor of an order are allowed
to remove an adjustment from the order.
|
2015-05-01 15:59:46 +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 |
|
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 |
|
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
|
af78859db6
|
Merge remote-tracking branch 'origin/master' into single-order-patches
|
2015-04-30 17:18:02 +10:00 |
|
Maikel Linke
|
5efc0a5110
|
quick fix: update fees after updating order
|
2015-04-30 16:29:51 +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
|
a207f50aeb
|
Merge branch 'master' into delay-devise-emails
Conflicts:
script/run_tests.sh
|
2015-04-30 12:29:06 +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 |
|
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
|
6a4de7c7e2
|
Hiding filters on list views because styling is broken
|
2015-04-24 19:35:18 +10:00 |
|
Rob Harrington
|
b1b1bfd8f6
|
Resolve conflict for overflow dropdown between multiple single-line-selectors on the one page
|
2015-04-24 16:05:39 +10:00 |
|
Maikel Linke
|
f94a5a975a
|
Edit Order: resend button uses new pretty template.
|
2015-04-24 15:31:45 +10:00 |
|
Maikel Linke
|
355221a273
|
Adding customer name to order edit page heading
|
2015-04-24 12:33:25 +10:00 |
|
Rob Harrington
|
6cde1f7732
|
Add tooltip with value for selectors
|
2015-04-23 14:11:50 +10:00 |
|
Rob Harrington
|
7b83438b5e
|
Pulling property values into the shopfront
|
2015-04-23 13:51:49 +10:00 |
|
Rob Harrington
|
e6a98747b4
|
correction in read only logic for filter selectors
|
2015-04-23 13:32:56 +10:00 |
|
Rob Harrington
|
ed15b95de0
|
Adding properties and taxons to producer modal
|
2015-04-23 12:31:20 +10:00 |
|
Rob Harrington
|
3df2720b31
|
Making filter selectors more flexible, allowing no active-selectors to be passed in, ie. read-only
|
2015-04-23 12:31:06 +10:00 |
|