raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-19 00:27:25 +00:00
Code Issues Packages Projects Releases Wiki Activity
5,423 Commits 17 Branches 453 Tags
0dcd8eb8cc9df25af785b09a26cb21bc5edbd2f8
Commit Graph

4039 Commits

Author SHA1 Message Date
Rohan Mitchell
0dcd8eb8cc Find adjustments with and without tax 2015-05-15 12:35:19 +10:00
Rohan Mitchell
ca1d88d8b1 Find line items with and without tax 2015-05-15 12:35:19 +10:00
Rohan Mitchell
c5b618b1f4 Admin can customise some fields on Xero invoices report 
Add require for xero invoices report spec
 2015-05-15 12:35:14 +10:00
Rohan Mitchell
0a2f2e0fba Output summary data without customisation 
Add route for xero invoices report

Add require for reports controller decorator
 2015-05-15 12:35:05 +10:00
Continuous Integration
e3723da65a Auto-merge from CI [skip ci] 2015-05-14 14:32:07 +10:00
Rohan Mitchell
b4755c37dc Merge branch 'analytics' into combined/fix-delayed-job-loop-and-analytics 2015-05-14 11:03:27 +10:00
Rohan Mitchell
b86872095a Add google analytics 2015-05-13 14:52:17 +10:00
Rohan Mitchell
3520127c41 Fix infinite job loop 2015-05-13 11:06:42 +10:00
Continuous Integration
3d0880857a Auto-merge from CI [skip ci] 2015-05-08 16:24:39 +10:00
Rob Harrington
f88fdac710 Adding module - doh! 2015-05-07 12:50:56 +10:00
Rob Harrington
a7019e7e78 Adding permissions method for order report enterprises 2015-05-07 12:50:56 +10:00
Rob Harrington
bd66091d75 Push logic for checking of user super admin status down into private method 2015-05-07 12:50:56 +10:00
Rob Harrington
7ffe0f042e Moving accessible_by scope on Enterprise to permissions 2015-05-07 12:50:55 +10:00
Rob Harrington
f79fba52be Hiding personal details of customers, where the user does not manage the distributor of the order or the coordinator of the order cycle 2015-05-07 12:50:55 +10:00
Rob Harrington
4259b466f5 Using new order and line item permissions to fetch items to display in Orders and Fullfillment reports 2015-05-07 12:50:55 +10:00
Rob Harrington
28bf7037db Updating methods for retrieving allowed producers, distributors and order cycles for order and fulfillment reports 2015-05-07 12:50:55 +10:00
Rob Harrington
ed9bbe2c45 Sorting Hub and Producer filter selectors by name 2015-05-07 12:50:55 +10:00
Rob Harrington
b5c7607d67 Order cycle filter resets date filters on BOM 2015-05-07 12:50:55 +10:00
Rob Harrington
e640376d63 Don't load cancelled orders into bulk order management 2015-05-07 12:50:54 +10:00
Rob Harrington
9ab16d8cec Allowing calls to Api::OrderCyclesController#accessible to specify :as => 'distributor' or 'producer' 2015-05-07 12:50:54 +10:00
Rob Harrington
d8c23d37ac Update accessible_by scope on enterprise, to read from permissions 2015-05-07 12:50:54 +10:00
Rob Harrington
89b153dc2c Update AJAX request to use sells instead of deprecated is_distributor attribute 2015-05-07 12:50:54 +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