Commit Graph

  • 12f39ce511 Patching up some more address bugs Will Marshall 2014-03-06 16:46:56 +11:00
  • 641796ed64 BOM: and quick search Rob H 2014-03-06 16:32:23 +11:00
  • d677116ea3 Overring before_address to conform to our new checkout as necessary Will Marshall 2014-03-06 16:24:08 +11:00
  • cc3fb27490 Restoring the old checkout, but NOW our new checkout is broken Will Marshall 2014-03-06 16:16:00 +11:00
  • 483e9d80bc BOM: filters work in combination Rob H 2014-03-06 13:21:31 +11:00
  • 43a4a3dd5a Alter on_hand counts for products to fix broken specs Rob H 2014-03-06 13:14:06 +11:00
  • 200e3fef77 Merge branch 'master' into bom Rob H 2014-03-06 12:52:36 +11:00
  • 068a6ebd95 Fix checkout specs Rob H 2014-03-06 12:49:29 +11:00
  • a40a0499e4 Reducing the number of country and state options Will Marshall 2014-03-06 11:33:38 +11:00
  • 2301f2372f Defaulting the quantity fields to nil Will Marshall 2014-03-06 11:04:11 +11:00
  • e146bb0dd0 Adding Quick Checkout link Will Marshall 2014-03-06 11:01:25 +11:00
  • 0726d591ac BOM: can filter by order cycle Rob H 2014-03-06 10:50:27 +11:00
  • 24d97bd754 Fix spec race condition Rohan Mitchell 2014-03-06 10:36:49 +11:00
  • 56646ca5e3 Getting some form state into the Order Will Marshall 2014-03-06 10:26:51 +11:00
  • 07caf99488 Enterprise user can delete product properties Rohan Mitchell 2014-03-05 16:52:06 +11:00
  • 922d817748 Product list view: For product with variants, show product price as min(variant prices) Rohan Mitchell 2014-03-05 16:16:42 +11:00
  • 7d0fdead7a Refactoring the way we default shipping_method_id Will Marshall 2014-03-05 15:49:47 +11:00
  • 3c108d3366 Improving the test suite, refactoring the form and Checkout controller to use data injection instead of haxxx Will Marshall 2014-03-05 15:31:41 +11:00
  • b89c84e8bd BPE: Do not show product price when product has variants Rohan Mitchell 2014-03-05 15:08:54 +11:00
  • 07d979b38f Collapse specs into one, halves spec runtime Rohan Mitchell 2014-03-05 14:07:07 +11:00
  • 637ccc113b Do not show products that have no stock available to the current distribution Rohan Mitchell 2014-03-05 13:25:40 +11:00
  • 17debd9fad On product list view, do not show variants that are out of stock Rohan Mitchell 2014-03-05 11:25:07 +11:00
  • 8234812157 Do not include master when outputting variants for oc/d Rohan Mitchell 2014-02-28 13:30:13 +11:00
  • ec6f70c145 On product list view, only show variants that are a member of the current order cycle Rohan Mitchell 2014-02-28 11:44:21 +11:00
  • 19350eeade Adding the 'same as billing address' JS Will Marshall 2014-03-05 12:29:49 +11:00
  • 1635e7338e Add ditributors and suppliers to OC show API Rob H 2014-03-05 12:17:08 +11:00
  • fc65eefcfd Add basic order cycle API Rob H 2014-03-05 12:00:26 +11:00
  • 66866f09b5 Adding the require ship address flag to admin UI: Will Marshall 2014-03-05 11:12:23 +11:00
  • 9f19e91e90 Merge branch 'master' into bom Rob H 2014-03-05 10:15:39 +11:00
  • 2a713245a8 BOM: date filter refactor and works with pending changes Rob H 2014-03-05 10:14:35 +11:00
  • 8b840388c8 Merge branch 'master' into checkout Will Marshall 2014-03-04 15:25:42 +11:00
  • b5019f12b4 Fixing up a couple of bugs introduced to the old step workflow Will Marshall 2014-03-04 15:07:00 +11:00
  • 74238b111e Fixing the order spec Will Marshall 2014-02-28 15:19:57 +11:00
  • 6934cf236f Update Rails Rohan Mitchell 2014-02-28 14:34:00 +11:00
  • 4087d08e8e Removing a save and open page call Will Marshall 2014-02-28 13:53:58 +11:00
  • 1d5addb06e Patching up our checkout flow so we don't try to create shipments before we have valid shipping addresses Will Marshall 2014-02-28 13:41:02 +11:00
  • 86a8b926f3 Adding conditions to the autopopulator for shipping address Will Marshall 2014-02-28 11:53:45 +11:00
  • 3db601f362 Merge branch 'master' into checkout Will Marshall 2014-02-27 16:29:21 +11:00
  • 6e05bd63c6 Pending a test that currently breaks Will Marshall 2014-02-27 16:29:03 +11:00
  • d6c71d5416 Fixing a nil bug in the referrer handling on login Will Marshall 2014-02-27 16:24:10 +11:00
  • 4a6c00e592 Removing bangs from stub since it's totes deprecated Will Marshall 2014-02-27 16:15:42 +11:00
  • d7921462eb Removing save and open page call Will Marshall 2014-02-27 16:15:13 +11:00
  • 4daeac0b14 Removing JMigrate warnings Will Marshall 2014-02-27 16:15:06 +11:00
  • c1cdf3e331 Removing some dud debugging stuff, fiddling with the checkout spec Will Marshall 2014-02-27 16:11:17 +11:00
  • 19fa7200f3 Fixing the login redirection issue Will Marshall 2014-02-27 14:47:56 +11:00
  • 91a8e1c071 Fixing a Javascript bug Will Marshall 2014-02-27 14:47:33 +11:00
  • 18f92fbff5 Fixing a nil.id bug Will Marshall 2014-02-27 14:04:04 +11:00
  • e92d21ec4e Patching a scoping bug that broke ALL the tests Will Marshall 2014-02-27 11:44:36 +11:00
  • 8bb742b3f2 Alphabetise suppliers when adding new product Rohan Mitchell 2014-02-27 11:33:02 +11:00
  • 3196e28d88 Admin can assign units to a product Rohan Mitchell 2014-02-27 11:29:39 +11:00
  • 353d2a4d9c Do not error when creating variant for product without non-unit option type Rohan Mitchell 2014-02-27 11:28:07 +11:00
  • 85606b2a0d Merge branch 'master' into checkout Will Marshall 2014-02-27 10:41:39 +11:00
  • 0bfa36056e removing some dud Angular crud Will Marshall 2014-02-26 16:15:53 +11:00
  • a0abd9c95a Merge branch 'master' into checkout Will Marshall 2014-02-26 15:52:37 +11:00
  • 7708bc9f99 Patching up our shipping selection so there's always a default Will Marshall 2014-02-26 15:48:23 +11:00
  • adf4c0e387 Sort enterprises by name on enterprise fees admin page Rohan Mitchell 2014-02-26 15:38:41 +11:00
  • f7e1befc75 Spec fees_for only sums per-item fees Rohan Mitchell 2014-02-26 15:16:30 +11:00
  • f5a3167fac Patching up the form and update to get form submission working Will Marshall 2014-02-26 15:12:35 +11:00
  • 11fb6c96a1 Charge per-order fees on orders exactly once Rohan Mitchell 2014-02-26 14:34:30 +11:00
  • b720a1d8f2 EnterpriseFee.clear_all_adjustments_on_order clears adjustments from per-order fees Rohan Mitchell 2014-02-26 14:33:28 +11:00
  • 9dec40703a Find exchanges with any of a number of variants Rohan Mitchell 2014-02-26 13:49:10 +11:00
  • 5057e236a9 Find enterprise fees with per-order calculators Rohan Mitchell 2014-02-26 13:48:51 +11:00
  • 890af85d30 Create per-order adjustments with EnterpriseFeeApplicator Rohan Mitchell 2014-02-26 13:28:05 +11:00
  • 75c8da1774 Rename create_adjustments_for to create_line_item_adjustments_for, only show per-item fees Rohan Mitchell 2014-02-26 12:07:38 +11:00
  • febbe087e9 Find EnterpriseFees with per-item calculators Rohan Mitchell 2014-02-26 10:39:39 +11:00
  • 41c61b3b12 BOM date filters work Rob H 2014-02-22 15:51:14 +11:00
  • 1f569e4be1 Add loading splash to BOM Rob H 2014-02-22 14:49:19 +11:00
  • 83e228dc63 Display message when no matching orders found for BOM Rob H 2014-02-22 11:48:24 +11:00
  • 1b10bf53c0 WIP: BOM loads with orders filtered by default date restrictions Rob H 2014-02-22 11:33:36 +11:00
  • da8a8e8a1a Rename method Rohan Mitchell 2014-02-21 15:49:10 +11:00
  • 08009d4020 Extract application of enterprise fees as adjustments into its own class Rohan Mitchell 2014-02-21 15:40:54 +11:00
  • 6b75e8c9ef Switching to f_form_for and :bill_address Will Marshall 2014-02-21 15:19:12 +11:00
  • a162f4a108 Adding some spec tweaks Will Marshall 2014-02-21 15:17:18 +11:00
  • 04ac6f466c Forcing the class of Country Will Marshall 2014-02-21 15:15:06 +11:00
  • b6b5c2889e Reworking checkout to use f_form_for, show validation, better controller layout Will Marshall 2014-02-21 14:31:03 +11:00
  • 5ec7a10e16 Add date filter fields to BOM Rob H 2014-02-21 14:01:33 +11:00
  • 97a6a812b8 Fix product listing appearing on RHS of page on Firefox Rohan Mitchell 2014-02-19 13:44:31 +11:00
  • 6d1a202800 Fix grammar Rohan Mitchell 2014-02-19 13:32:57 +11:00
  • f88b930137 Extract unit_value_with_description into unit_description only when a string starting with a number is provided Rohan Mitchell 2014-02-19 13:32:17 +11:00
  • acbf1ed680 Refactor fragile spec to use has_field? and has_select? in an attempt to make it more reliable in CI Rohan Mitchell 2014-02-19 13:12:52 +11:00
  • 3f9f24157c Do not show unit value or description when product does not have a unit-related option type Rohan Mitchell 2014-02-19 12:07:53 +11:00
  • 3024bbbeb5 Edit unit value and description of variant Rohan Mitchell 2014-02-19 11:56:37 +11:00
  • fb42724430 Remove entire field div instead of just the text field Rohan Mitchell 2014-02-19 11:56:10 +11:00
  • 7b80518621 On admin variant edit page, do not show option values for unit-related option types Rohan Mitchell 2014-02-19 11:29:26 +11:00
  • b0cb19e370 Do not show master options text (eg. '1kg') when product has variants Rohan Mitchell 2014-02-18 16:45:57 +11:00
  • adb58bc059 Moving from @order to current_order to keep DRY Will Marshall 2014-02-18 15:07:00 +11:00
  • 6a861de1e1 Reworking the checkout form some more Will Marshall 2014-02-18 14:50:50 +11:00
  • 4ee4ea7c60 Fix mismatch between client and server variants (ordering issue) Rohan Mitchell 2014-02-18 14:02:17 +11:00
  • ece7caa14a Moving Darkswarm to new Angular version Will Marshall 2014-02-18 13:59:52 +11:00
  • 3024007bd3 Reworking our page structure to work better with Angular controllers Will Marshall 2014-02-18 13:51:20 +11:00
  • 547f46fbc9 Deal with unit_value of zero correctly - do not treat as nil Rohan Mitchell 2014-02-18 10:32:36 +11:00
  • 19e31a264d Tidying footer contact details Will Marshall 2014-02-14 15:49:16 +11:00
  • 502dba1b3f Fixing bug #281 Will Marshall 2014-02-14 15:35:40 +11:00
  • 134d9831fe Fixing bug #271 Will Marshall 2014-02-14 15:34:55 +11:00
  • e9178570e9 Committing order summary. NO TESTS YET Will Marshall 2014-02-14 15:18:03 +11:00
  • 09d8e19c35 DRYING UP MY VIEWS Will Marshall 2014-02-14 14:43:50 +11:00
  • a6d58aa498 Partializing and adding yield blocks Will Marshall 2014-02-14 14:40:58 +11:00
  • 5c498735b0 Moving from new to edit Will Marshall 2014-02-14 14:26:31 +11:00
  • a722320ece Patching up the tests for new content Will Marshall 2014-02-14 13:43:23 +11:00
  • 3c696b6762 Adding payment method switching Will Marshall 2014-02-14 13:30:28 +11:00