Commit Graph

  • 7b83438b5e Pulling property values into the shopfront Rob Harrington 2015-04-23 13:51:49 +10:00
  • e6a98747b4 correction in read only logic for filter selectors Rob Harrington 2015-04-23 13:32:56 +10:00
  • ed15b95de0 Adding properties and taxons to producer modal Rob Harrington 2015-04-23 12:31:20 +10:00
  • 3df2720b31 Making filter selectors more flexible, allowing no active-selectors to be passed in, ie. read-only Rob Harrington 2015-04-23 12:31:06 +10:00
  • eff8681d9b Merge branch 'master' into single-order-patches Maikel Linke 2015-04-23 12:11:44 +10:00
  • a937fd3c61 Using variant overrides in variant seach on order edit page Maikel Linke 2015-04-23 11:37:10 +10:00
  • 3412bc25bf Edit Orders: more variant info in variant search Maikel Linke 2015-04-23 10:17:01 +10:00
  • f1a8011e13 Documentation of Variant.full_name Maikel Linke 2015-04-23 10:02:32 +10:00
  • f70bfee481 Merge branch 'master' into require_standard_variant Rohan Mitchell 2015-04-23 09:56:41 +10:00
  • 92e03e208f Extract load_environment method Rohan Mitchell 2015-04-22 15:53:54 +10:00
  • 76d6345ab5 Merge remote-tracking branch 'origin/master' into require_standard_variant Rob Harrington 2015-04-22 21:02:47 +10:00
  • 0251d8962d Adding sku to BPE Rob Harrington 2015-04-22 21:01:36 +10:00
  • 1c617994fc User can toggle property inheritence from product property page, and checking the box shows a list of producer properties that will be inherited from Rob Harrington 2015-04-22 17:23:44 +10:00
  • 4a4b3da551 Using properties_including_inherited for product properties on the shop page Rob Harrington 2015-04-22 16:15:59 +10:00
  • e546388784 Rename properties_h to properties_including_inherited Rob Harrington 2015-04-22 16:08:52 +10:00
  • 976c24cf4c properties_h uses inherit_properties flag, and returns property id rather than presentation Rob Harrington 2015-04-22 16:06:01 +10:00
  • f610a709e1 Adding inherits_properties to BPE Rob Harrington 2015-04-22 12:51:00 +10:00
  • 5d6f265c0a Moving spree namespaced serializers into admin Rob Harrington 2015-04-22 12:15:45 +10:00
  • 1f293bb787 Adding inherits properties flag to products Rob Harrington 2015-04-22 11:56:45 +10:00
  • a4a41ae26a Refactor properties_h Rob Harrington 2015-04-22 11:47:47 +10:00
  • 7aeeb6d18f Add script to run JS specs in CI Rohan Mitchell 2015-04-22 16:36:31 +10:00
  • 7a78f4870a Use phantomjs for js specs, so we can run them in CI Rohan Mitchell 2015-04-22 16:33:44 +10:00
  • 28c79cdb50 Use db:test:load instead of db:test:prepare in CI to avoid conflicts between branches Rohan Mitchell 2015-04-21 16:40:45 +10:00
  • b9e3ff54b8 Add build script to merge to master Rohan Mitchell 2015-04-22 14:47:54 +10:00
  • 0c0be0112e Update paths to include ci Rohan Mitchell 2015-04-22 14:31:30 +10:00
  • 883a2e0a0e WIP: Move CI scripts to their own folder Rohan Mitchell 2015-04-22 14:29:59 +10:00
  • 6c81109b17 Local branch isn't checked out, so we need to test remote branch Rohan Mitchell 2015-04-22 14:17:07 +10:00
  • 1c9a95b3d6 Set execute bit Rohan Mitchell 2015-04-22 13:19:17 +10:00
  • 53c4c8b5b7 Push to staging fails unless master has been merged into current branch Rohan Mitchell 2015-04-22 13:16:39 +10:00
  • d406f9ccdf Tests fail unless master has been merged into current branch Rohan Mitchell 2015-04-22 13:14:51 +10:00
  • 7d4a4f8f9d Pushing to staging first loads staging baseline data Rohan Mitchell 2015-04-22 12:37:06 +10:00
  • 35536a629c Set execute bit Rohan Mitchell 2015-04-22 10:28:01 +10:00
  • 699a28e14c Merge branch 'master' into require_standard_variant Rob Harrington 2015-04-22 10:58:43 +10:00
  • 7b8938b5f6 Run password reset job for spec that requires it Rohan Mitchell 2015-04-22 07:32:22 +10:00
  • b2717ffca0 Use db:test:load instead of db:test:prepare in CI to avoid conflicts between branches Rohan Mitchell 2015-04-21 16:40:45 +10:00
  • 700cb73b8f Send enterprise confirmation emails asynchronously Rohan Mitchell 2015-04-21 16:19:02 +10:00
  • 9d225142c8 Send password reset instructions asynchronously Rohan Mitchell 2015-04-21 15:44:01 +10:00
  • 998288e21f Keep failed jobs around for debugging. Limit max runtime to 15 mins (we're only sending emails at present). Notify bugsnag of errors in jobs. Rohan Mitchell 2015-04-21 15:37:36 +10:00
  • 9f93c9f221 Swap Jenkins build badge out for Buildkite Rohan Mitchell 2015-04-21 15:12:39 +10:00
  • 22127b2d18 Use progress formatter for less verbose CI output. I miss Fuubar formatter, though. Rohan Mitchell 2015-04-21 15:10:05 +10:00
  • 692e58e8f7 Output spec-by-spec results to track specs-hanging-at-90-percent issue Rohan Mitchell 2015-04-21 10:52:14 +10:00
  • 4158663e9a Pushing to production saves staging baseline data Rohan Mitchell 2015-04-16 16:18:42 +10:00
  • a75a76840d Merging master into require_standard_variant Rob Harrington 2015-04-17 21:18:24 +10:00
  • ff2e6d9ca4 Test deletion rather than destruction on variant model spec Rob Harrington 2015-04-17 17:25:13 +10:00
  • 893b743973 tidy (rm comment) Maikel Linke 2015-04-17 17:00:18 +10:00
  • 03fd148f41 showing profile modals on groups/hubs Maikel Linke 2015-04-17 16:58:49 +10:00
  • 72d553ef0c Test actual deletion of variants Rob Harrington 2015-04-17 16:51:02 +10:00
  • 63353ebace Don't try and delete the only variant, that will never work! Rob Harrington 2015-04-17 16:49:14 +10:00
  • a1673afff0 Allow more time for phantomjs, required by first admin spec where assets are compiled Rohan Mitchell 2015-04-17 15:46:51 +10:00
  • 0d4dbd23fd Remove redundant spec line, test that sells is not changed Rohan Mitchell 2015-04-17 15:42:42 +10:00
  • 0d9ba4257d Merge branch 'properties' Rohan Mitchell 2015-04-17 15:25:51 +10:00
  • c43eb9ef72 Merge branch 'email_user' into properties Rob Harrington 2015-04-17 15:17:37 +10:00
  • 46690faffb Fixing Darkswarm Angular Product Controller spec Rob Harrington 2015-04-17 15:14:19 +10:00
  • 32f14bca00 Preventing fitting of selectors when there are none Rob Harrington 2015-04-17 15:10:41 +10:00
  • 042e076b58 Fix tax-related spec failures Rohan Mitchell 2015-04-17 14:46:32 +10:00
  • 6d96a7a60b Specifiy that allSelectors attribute on filterSelectors directive is optional Rob Harrington 2015-04-17 14:43:09 +10:00
  • c8bf207187 Fixing trial expiry test Rob Harrington 2015-04-17 13:14:33 +10:00
  • 9e8483348f Fix spec - enterprise needs to charge sales tax for tax to be charged Rohan Mitchell 2015-04-09 14:38:58 +10:00
  • 81324f3cc4 Do not charge tax on shipments when distributor does not charge sales tax Rohan Mitchell 2015-04-09 11:04:54 +10:00
  • 0b8a619274 When the order does not have a hub, all tax rates apply Rohan Mitchell 2015-04-09 10:52:23 +10:00
  • 048c6a8ee8 Include only the bare minimum of helpers into JS template context to avoid intermittent SASS @include issues Rohan Mitchell 2015-04-09 10:03:04 +10:00
  • 3e8801b12b Do not charge sales tax on items or on enterprise fees when the distributor of the order does not charge sales tax Rohan Mitchell 2015-04-09 09:51:52 +10:00
  • a6a5fdfb3b Require that the user selects whether their enterprise charges sales tax Rohan Mitchell 2015-04-08 13:25:47 +10:00
  • 0bdb8f7241 User can set whether an enterprise charges sales tax when registering Rohan Mitchell 2015-04-08 12:05:07 +10:00
  • 05551aa2a9 Make helpers available to javascript templates Rohan Mitchell 2015-04-08 12:04:31 +10:00
  • 9bbc151cae Admin can set enterprises to charge or not charge sales tax Rohan Mitchell 2015-04-08 10:40:38 +10:00
  • 08fef890ec Do not show tax lines if there is no tax on the order Rohan Mitchell 2015-04-02 16:07:19 +11:00
  • a93633a626 Show tax on order confirmation emails Rohan Mitchell 2015-04-02 16:02:55 +11:00
  • 4bd1ff2011 Extract the bulk of the confirmation emails into partials, eliminating a lot of duplication Rohan Mitchell 2015-04-02 16:00:48 +11:00
  • 2914990444 Add save_and_open spec helper method to open HTML emails in the browser Rohan Mitchell 2015-04-02 15:59:33 +11:00
  • 3ce2c5b84f Show tax on order confirmation page Rohan Mitchell 2015-04-02 14:53:57 +11:00
  • 77d7255243 Use short syntax for rendering partials Rohan Mitchell 2015-04-02 14:50:52 +11:00
  • 6bb926f811 Do not show tax in checkout Rohan Mitchell 2015-04-02 12:34:14 +11:00
  • 829d11d4b2 Deliver a warning if attempting to create an invalid taxed_product from factory Rohan Mitchell 2015-04-02 12:33:55 +11:00
  • beec910445 Display tax in cart Rohan Mitchell 2015-04-02 11:23:28 +11:00
  • 68f0e51c02 Change add_product_to_cart spec helper to use OrderPopulator, reducing inconsistencies in order adjustments, tax etc. Rohan Mitchell 2015-04-02 11:23:04 +11:00
  • 210c76eddc Checkout won't load without payment and shipping methods; move spec to context where it can test the checkout Rohan Mitchell 2015-04-02 11:22:12 +11:00
  • e75c6a8e1d Add helper to display total tax on an order Rohan Mitchell 2015-04-02 11:20:47 +11:00
  • b44f2bcdf5 Fixing trial expiry test Rob Harrington 2015-04-17 13:14:33 +10:00
  • f13b52411d Merge branch master into properties Rob Harrington 2015-04-17 13:23:33 +10:00
  • 0cf8b017b9 Pulling out taxons and properties placeholders from producer and product modals Rob Harrington 2015-04-17 13:20:01 +10:00
  • b9f19d5777 Fixing broken specs Rob Harrington 2015-04-17 13:00:20 +10:00
  • 9ee25c4e42 Making spec better Rob Harrington 2015-01-29 13:06:28 +11:00
  • 2d7fb3fd67 Updating name of spec Rob Harrington 2015-01-29 12:43:40 +11:00
  • 7596270154 A few more changes to tidy up standard variant migration Rob Harrington 2015-01-29 12:37:31 +11:00
  • 5d9e861ee4 Working migration to complete deprecation of master variants Rob Harrington 2015-01-28 17:13:56 +11:00
  • 447a5481a3 WIP: Building migration to duplicate master variants Rob Harrington 2014-10-03 17:56:05 +10:00
  • 8248e382f3 Greying out disabled action button Rob Harrington 2014-10-03 14:30:23 +10:00
  • 4b182f9248 Can't delete final variant on a product from BPE Rob Harrington 2014-10-03 14:08:03 +10:00
  • 2b47c9145a Cannot delete last variant of product Rob Harrington 2014-10-03 13:59:34 +10:00
  • fcb3bc894b Cleanup Rob Harrington 2014-10-02 18:35:37 +10:00
  • a223a2d662 Cannot remove all variants from a product Rob Harrington 2014-10-02 18:32:40 +10:00
  • 5e2fe56c22 Cleanup Rob Harrington 2014-10-02 18:05:24 +10:00
  • 89afbc80a6 Set initial on_hand to 0 Rob Harrington 2014-10-02 18:01:46 +10:00
  • 971723964e Update outdated spec Rob Harrington 2014-10-02 17:49:57 +10:00
  • 28486f9e76 Only adds standard variant on create Rob Harrington 2014-10-02 17:24:10 +10:00
  • 869551a17c Adding a standard variant again Rob Harrington 2014-10-02 17:22:30 +10:00
  • 13a910c372 Replace validates_associated on master with current spree method for error reporting master saves Rob Harrington 2014-10-02 17:08:18 +10:00
  • 0a7b01ff07 Product requires variant_unit and master requires unit_value and/or unit_desc Rob Harrington 2014-10-02 16:13:03 +10:00
  • dfb513cce7 Use after_create callback to duplicate master variant Rob Harrington 2014-09-26 13:11:32 +10:00