raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-01-29 21:17:17 +00:00
Code Issues Packages Projects Releases Wiki Activity
5,306 Commits 20 Branches 451 Tags
976c24cf4c2b8b3cfd69bbd97fa88bf267d94a32
Commit Graph

5306 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Rob Harrington
976c24cf4c properties_h uses inherit_properties flag, and returns property id rather than presentation 2015-04-22 21:02:07 +10:00
Rob Harrington
f610a709e1 Adding inherits_properties to BPE 2015-04-22 21:02:06 +10:00
Rob Harrington
5d6f265c0a Moving spree namespaced serializers into admin 2015-04-22 21:02:06 +10:00
Rob Harrington
1f293bb787 Adding inherits properties flag to products 2015-04-22 21:02:06 +10:00
Rob Harrington
a4a41ae26a Refactor properties_h 2015-04-22 21:02:06 +10:00
Rohan Mitchell
28c79cdb50 Use db:test:load instead of db:test:prepare in CI to avoid conflicts between branches 2015-04-22 15:01:22 +10:00
Rohan Mitchell
b9e3ff54b8 Add build script to merge to master 2015-04-22 14:47:54 +10:00
Rohan Mitchell
0c0be0112e Update paths to include ci 2015-04-22 14:31:30 +10:00
Rohan Mitchell
883a2e0a0e WIP: Move CI scripts to their own folder 2015-04-22 14:29:59 +10:00
Rohan Mitchell
6c81109b17 Local branch isn't checked out, so we need to test remote branch 2015-04-22 14:17:07 +10:00
Rohan Mitchell
1c9a95b3d6 Set execute bit 2015-04-22 13:19:17 +10:00
Rohan Mitchell
53c4c8b5b7 Push to staging fails unless master has been merged into current branch 2015-04-22 13:16:39 +10:00
Rohan Mitchell
d406f9ccdf Tests fail unless master has been merged into current branch 2015-04-22 13:14:51 +10:00
Rohan Mitchell
7d4a4f8f9d Pushing to staging first loads staging baseline data 2015-04-22 12:55:36 +10:00
Rohan Mitchell
35536a629c Set execute bit 2015-04-22 12:55:36 +10:00
Rohan Mitchell
9f93c9f221 Swap Jenkins build badge out for Buildkite 2015-04-21 15:17:34 +10:00
Rohan Mitchell
22127b2d18 Use progress formatter for less verbose CI output. I miss Fuubar formatter, though. 2015-04-21 15:17:34 +10:00
Rohan Mitchell
692e58e8f7 Output spec-by-spec results to track specs-hanging-at-90-percent issue 2015-04-21 10:52:14 +10:00
Rohan Mitchell
4158663e9a Pushing to production saves staging baseline data 2015-04-21 10:47:36 +10:00
Rohan Mitchell
a1673afff0 Allow more time for phantomjs, required by first admin spec where assets are compiled 2015-04-17 15:46:51 +10:00
Rohan Mitchell
0d4dbd23fd Remove redundant spec line, test that sells is not changed 2015-04-17 15:42:42 +10:00
Rohan Mitchell
0d9ba4257d Merge branch 'properties' 2015-04-17 15:25:51 +10:00
Rob Harrington
c43eb9ef72 Merge branch 'email_user' into properties 2015-04-17 15:17:37 +10:00
Rob Harrington
46690faffb Fixing Darkswarm Angular Product Controller spec 2015-04-17 15:14:19 +10:00
Rob Harrington
32f14bca00 Preventing fitting of selectors when there are none 2015-04-17 15:10:41 +10:00
Rohan Mitchell
042e076b58 Fix tax-related spec failures 2015-04-17 14:46:32 +10:00
Rob Harrington
6d96a7a60b Specifiy that allSelectors attribute on filterSelectors directive is optional 2015-04-17 14:43:09 +10:00
Rob Harrington
c8bf207187 Fixing trial expiry test 2015-04-17 14:33:47 +10:00
Rohan Mitchell
9e8483348f Fix spec - enterprise needs to charge sales tax for tax to be charged 2015-04-17 13:41:38 +10:00
Rohan Mitchell
81324f3cc4 Do not charge tax on shipments when distributor does not charge sales tax 2015-04-17 13:41:38 +10:00
Rohan Mitchell
0b8a619274 When the order does not have a hub, all tax rates apply 2015-04-17 13:41:38 +10:00
Rohan Mitchell
048c6a8ee8 Include only the bare minimum of helpers into JS template context to avoid intermittent SASS @include issues 2015-04-17 13:41:38 +10:00
Rohan Mitchell
3e8801b12b Do not charge sales tax on items or on enterprise fees when the distributor of the order does not charge sales tax 2015-04-17 13:41:38 +10:00
Rohan Mitchell
a6a5fdfb3b Require that the user selects whether their enterprise charges sales tax 2015-04-17 13:41:38 +10:00
Rohan Mitchell
0bdb8f7241 User can set whether an enterprise charges sales tax when registering 2015-04-17 13:41:38 +10:00
Rohan Mitchell
05551aa2a9 Make helpers available to javascript templates 2015-04-17 13:41:38 +10:00
Rohan Mitchell
9bbc151cae Admin can set enterprises to charge or not charge sales tax 2015-04-17 13:41:38 +10:00
Rohan Mitchell
08fef890ec Do not show tax lines if there is no tax on the order 2015-04-17 13:41:14 +10:00
Rohan Mitchell
a93633a626 Show tax on order confirmation emails 2015-04-17 13:41:14 +10:00
Rohan Mitchell
4bd1ff2011 Extract the bulk of the confirmation emails into partials, eliminating a lot of duplication 2015-04-17 13:40:08 +10:00
Rohan Mitchell
2914990444 Add save_and_open spec helper method to open HTML emails in the browser 2015-04-17 13:40:08 +10:00
Rohan Mitchell
3ce2c5b84f Show tax on order confirmation page 2015-04-17 13:40:08 +10:00
Rohan Mitchell
77d7255243 Use short syntax for rendering partials 2015-04-17 13:39:10 +10:00
Rohan Mitchell
6bb926f811 Do not show tax in checkout 2015-04-17 13:39:09 +10:00
Rohan Mitchell
829d11d4b2 Deliver a warning if attempting to create an invalid taxed_product from factory 2015-04-17 13:39:09 +10:00
Rohan Mitchell
beec910445 Display tax in cart 2015-04-17 13:39:09 +10:00
Rohan Mitchell
68f0e51c02 Change add_product_to_cart spec helper to use OrderPopulator, reducing inconsistencies in order adjustments, tax etc. 2015-04-17 13:39:09 +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
e75c6a8e1d Add helper to display total tax on an order 2015-04-17 13:39:09 +10:00
Rob Harrington
b44f2bcdf5 Fixing trial expiry test 2015-04-17 13:30:36 +10:00