raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-01-31 21:37:16 +00:00
Code Issues Packages Projects Releases Wiki Activity
5,356 Commits 18 Branches 452 Tags
ddde4e9dcb07f4183fb8945cdc832e60bb35e40c
Commit Graph

49 Commits

Author SHA1 Message Date
Rohan Mitchell
042e076b58 Fix tax-related spec failures 2015-04-17 14:46:32 +10:00
Rohan Mitchell
210c76eddc Checkout won't load without payment and shipping methods; move spec to context where it can test the checkout 2015-04-17 13:39:09 +10:00
Rohan Mitchell
84f3097217 Calculate total tax from the tax included in all the adjustments on the order 2015-03-25 16:27:29 +11:00
Rohan Mitchell
333a4ecf2f Include enterprise fee tax on sales tax report 2015-03-25 16:27:29 +11:00
Rohan Mitchell
40b4edeca1 Replace zoned_order factory with zone_with_member. In practice, former had issues with circular dependencies. 2015-03-25 16:27:29 +11:00
Rohan Mitchell
69dc92dec1 Create factories zoned_order and taxed_product 2015-03-25 16:27:29 +11:00
Rohan Mitchell
d489e06009 Retrieve line item sales tax from included_tax rather than tax amount 2015-03-25 16:27:29 +11:00
Rohan Mitchell
daa30ed518 Retrieve the shipping tax on the order instead of calculating it from scratch 2015-03-25 16:27:29 +11:00
Rohan Mitchell
a5716cf2c2 Merge branch 'ordercyclemanagementreports2' of https://github.com/lin-d-hop/openfoodnetwork into lin-d-hop-ordercyclemanagementreports2 2015-03-12 12:15:22 +11:00
Rohan Mitchell
ec22f4c09f Sales tax report pulls sales tax from adjustments instead of recalculating it at report-time 2015-03-05 10:43:57 +11:00
Rohan Mitchell
54894fb222 Update spec with correct tax amounts 2015-03-05 10:43:56 +11:00
Rohan Mitchell
0b636c1d89 Combine spec cases for faster runtime 2015-03-05 10:43:54 +11:00
Rohan Mitchell
2b9fef6aec Convert to Ruby 1.9 hash syntax 2015-03-05 10:43:53 +11:00
Rohan Mitchell
3aa30af199 Remove unneeded objects from spec setup 2015-03-05 10:43:53 +11:00
Rohan Mitchell
0212351d32 Tighten test 2015-03-05 10:43:53 +11:00
Rohan Mitchell
29653a5595 Fix spec infinite recursion issue 2015-03-05 10:43:52 +11:00
Matt-Yorkley
e6368af757 Update reports_spec.rb 2015-03-05 10:43:52 +11:00
Matt-Yorkley
2c80be7e9e Update 2015-03-05 10:43:52 +11:00
Matt-Yorkley
3f61a5412c Spec file attempt... 2015-03-05 10:43:51 +11:00
Matt-Yorkley
bbca674937 Update reports_spec.rb 2015-03-05 10:43:51 +11:00
Matt-Yorkley
be55f461d0 Report: sales tax on orders 2015-03-05 10:43:50 +11:00
Lynne Davis
87b1ab9a1a LD: Adding additional functionality for order cycle management reports - adding hub code model, adding temp_controlled bool, adding delivery report 2015-03-03 16:01:42 +11:00
Rohan Mitchell
72118f4e2e Fix syntax error, spec for removed column 2014-12-19 10:01:46 +11:00
Rohan Mitchell
3b58d99abc Fix spec failure 2014-12-19 09:51:02 +11:00
Rohan Mitchell
4a30f27b3d Merge branch '266reportsbranch' of https://github.com/lin-d-hop/openfoodnetwork into lin-d-hop-266reportsbranch 
Conflicts:
	app/controllers/spree/admin/reports_controller_decorator.rb
	spec/models/spree/order_spec.rb
 2014-12-19 09:38:02 +11:00
Lynne Davis
c2c51a5531 Fixing typo in feature spec 2014-12-02 12:24:34 +00:00
Rob Harrington
d9d6b7bee4 Adding filtering to Users and Enterprises report 2014-11-14 16:36:22 +11:00
Rob Harrington
65a5960fcc WIP: Add route for User and Enterprise report 2014-11-14 16:36:22 +11:00
Lynne Davis
6f6ae309c6 266 UK: Adding first UK report - Payment Methods Report - to find balances per ordercycle for multiple payment method options. Working, but not complete to spec yet 2014-11-02 11:26:39 +00:00
Rafael Schouten
feff4fd46f fix reports taxons and specs 2014-10-25 18:51:03 +11:00
Rob Harrington
9520eeeb15 can specify attributes for create_enterpise_user 2014-09-25 11:56:18 +10:00
Rohan Mitchell
908f7871bb Orders and fulfilment report handles order cycles with nil opening or closing times 2014-06-12 11:49:54 +10:00
Rohan Mitchell
6d2f77b308 Fix report spec 2014-01-22 10:16:45 +11:00
Rohan Mitchell
9c28b5baae Fix product lists not matching when saving changes to product unit+values fields 2014-01-10 15:43:45 +11:00
Will Marshall
6e36142809 Making some changes to the data on the products inventory page 2013-12-13 11:39:45 +11:00
Will Marshall
e98031e581 Fixing some minor report bugs 2013-12-13 10:12:41 +11:00
Will Marshall
7bc754a598 Adding filtering to the products page 2013-11-28 13:44:21 +11:00
Will Marshall
27f99d1383 Working version of Customers reports without filters 2013-11-22 16:53:57 +11:00
Will Marshall
51ea6fcd67 Starting on the Customers Report 2013-11-22 14:57:11 +11:00
Will Marshall
5e170a843e Forcing a rebuild on Jenkins 2013-11-21 17:22:47 +11:00
Will Marshall
c695bafe69 Reworking the way the Reports works so we have more granular control over what shows 2013-11-21 16:45:59 +11:00
Will Marshall
d703e1836f Working build of P&I report 2013-11-21 14:06:24 +11:00
Will Marshall
5772fa9589 Boilerplate for the new Product and Inventory report, sans any functionality 2013-11-20 10:34:18 +11:00
David Cook
fe513d42c4 Rename 'Order Cycles' report group to 'Orders & Fulfillment' 2013-09-18 09:25:51 +10:00
David Cook
9de5a0061e Enterprise user can only view their own distributors in reports (and remove redundant feature test) 2013-08-23 16:09:37 +10:00
David Cook
b41f6234db Test to filter report by order cycle 2013-08-21 17:23:55 +10:00
Rohan Mitchell
f1485bf9c5 Remove shipping method from product distribution in factory. 2013-08-12 14:21:39 +10:00
Rohan Mitchell
9f6d1a2f18 Order cycle reports are precise to time of day, not just date 2013-04-25 21:22:26 +10:00
Rohan Mitchell
488fc2d60e Upgrade capybara, spec/requests changed to spec/features 2013-01-15 10:10:24 +11:00