Commit Graph

  • b6590000a4 Improving Product's has_stock, filtering Shop#products to in_stock products Will Marshall 2014-01-17 14:41:15 +11:00
  • cfbf4d5bc4 Adding attributes to Order Managment API Rob H 2014-01-17 10:35:40 +08:00
  • 6f5ff0ab2c Making a light grey option Will Marshall 2014-01-16 16:49:50 +11:00
  • 939b216c12 Changing text to N/A Will Marshall 2014-01-16 16:31:46 +11:00
  • dac287f67a Removing distributors and farmers, curse them Will Marshall 2014-01-16 16:28:10 +11:00
  • b6d796e3bc Getting in ze test for previous commit Will Marshall 2014-01-16 16:25:41 +11:00
  • 4e9ae7549e Add sub menu to Orders menu item in admin view, add 'Bulk Order Management' page Rob H 2014-01-16 13:20:07 +08:00
  • 031414a41f Make BPE menu tab selected Rob H 2014-01-16 13:18:28 +08:00
  • d68551c6eb Patching an issue with quantity fields showing for products with variants Will Marshall 2014-01-16 16:09:03 +11:00
  • cbce5958e0 Removing an attr_accessible which breaks EVERYTHING Will Marshall 2014-01-16 15:46:44 +11:00
  • 0ddef9626e First working image upload for enterprise logos Will Marshall 2014-01-16 14:17:22 +11:00
  • 11499178cb Set up API for Bulk Order Management (BOM) Rob H 2014-01-16 11:56:11 +08:00
  • d861495d7d Fix incomplete save when first setting variant_unit Rohan Mitchell 2014-01-16 14:20:26 +11:00
  • 1ebfea9c76 Require uglifier, should fix asset precompilation Rohan Mitchell 2014-01-09 09:35:29 +11:00
  • cdd64d438a Adding another trivial sort to a test Will Marshall 2014-01-16 13:23:57 +11:00
  • 1a1057b824 Removing unhelpful gem Will Marshall 2014-01-16 13:04:44 +11:00
  • 35cc113aca Fixing the checkout spec to conform to reply_to instead of from on mailer Will Marshall 2014-01-16 13:04:26 +11:00
  • 7d224fb5ac Update js compressor for staging as well as production Rohan Mitchell 2014-01-08 17:25:32 +11:00
  • 38a20e4a8c Turn off name mangling to make DI more natural in angular - https://shellycloud.com/blog/2013/10/how-to-integrate-angularjs-with-rails-4 Rohan Mitchell 2014-01-08 16:45:21 +11:00
  • 26a8daed0e Patching up the order mailer to set reply_to Will Marshall 2014-01-16 11:39:10 +11:00
  • d4d2482927 Adding ng-min Will Marshall 2014-01-16 11:24:53 +11:00
  • ce5b24a777 Prevent duplicate filters being added Rob H 2014-01-15 15:50:41 +08:00
  • 8146301b2f Add validation to BPE advanced filter box Rob H 2014-01-15 14:35:46 +08:00
  • 29235cd2cb Merge branch 'master' into product-amount-units Rohan Mitchell 2014-01-14 15:34:05 +11:00
  • 7bbf2037e8 Add commented out option for remote debugging via poltergeist Rohan Mitchell 2014-01-14 15:15:09 +11:00
  • 68e5de0290 Update acceptance specs to expect unit values to be stored in base units Rohan Mitchell 2014-01-14 15:14:54 +11:00
  • d0d0fc1a06 Fix intermittently failing spec - comparison of slightly differing dates Rohan Mitchell 2014-01-14 11:47:56 +11:00
  • a30e46d747 Do not delete variant options_text when saving/refreshing products Rohan Mitchell 2014-01-14 11:40:58 +11:00
  • 9442b7b5dc On save, scale from chosen unit to base unit (eg. mL to L) Rohan Mitchell 2014-01-14 11:13:19 +11:00
  • c43b56f3f8 On load, scale from base unit to chosen unit (eg. g to kg) Rohan Mitchell 2014-01-14 10:16:21 +11:00
  • 22ec6aa852 Add comment Rohan Mitchell 2014-01-10 15:59:38 +11:00
  • 28c641a932 Remove redundant test stubs Rohan Mitchell 2014-01-10 15:44:16 +11:00
  • 9c28b5baae Fix product lists not matching when saving changes to product unit+values fields Rohan Mitchell 2014-01-10 15:43:45 +11:00
  • aff35e5749 Remove unused toggle-column-list directive Rob H 2014-01-10 01:08:03 +08:00
  • 29ba0ccc97 Initialise BPE page with 'Available On' column hidden Rob H 2014-01-10 00:46:42 +08:00
  • ee2da3e008 Toggle new view controls on BPE Rob H 2014-01-10 00:26:54 +08:00
  • a60c9a9cea When variant already has a value set, remove old option value and assign a new one Rohan Mitchell 2014-01-09 14:11:54 +11:00
  • c396c2a21f Improve speed of BPE specs Rohan Mitchell 2014-01-09 12:37:43 +11:00
  • 420ff37562 Provide explicit ordering for intermittently failing spec Rohan Mitchell 2014-01-09 12:09:50 +11:00
  • cbe46bffed Merge branch 'bpe_paginate' Rohan Mitchell 2014-01-09 12:07:42 +11:00
  • 8f479868b4 Fix js test errors - foundation not found, but not reqd for testing angular Rohan Mitchell 2014-01-09 11:44:03 +11:00
  • e35eccca93 Revert 3b3815a 6c5539a 39c2803 - remove non-mangling js compression which breaks build Rohan Mitchell 2014-01-09 11:18:54 +11:00
  • 3b3815a09d Require uglifier, should fix asset precompilation Rohan Mitchell 2014-01-09 09:35:29 +11:00
  • 6c5539a1da Update js compressor for staging as well as production Rohan Mitchell 2014-01-08 17:25:32 +11:00
  • 39c2803493 Turn off name mangling to make DI more natural in angular - https://shellycloud.com/blog/2013/10/how-to-integrate-angularjs-with-rails-4 Rohan Mitchell 2014-01-08 16:45:21 +11:00
  • a67cea3fcd Precompile darkswarm css and js Rohan Mitchell 2014-01-08 15:58:47 +11:00
  • f317f3aa7f Precompile darkswarm css and js Rohan Mitchell 2014-01-08 15:58:47 +11:00
  • ac17502046 Fix test Rob H 2014-01-08 12:30:32 +08:00
  • 533a987684 Uncommenting imgs for Angular, disabling image loading in Poltergeist/Phantom Will Marshall 2014-01-08 15:20:18 +11:00
  • c08c42b087 Fix inconsistent test fails - insignificant ordering Rohan Mitchell 2014-01-08 15:11:38 +11:00
  • e5514920c8 Fixing up the error messages in our specs Will Marshall 2014-01-08 15:11:23 +11:00
  • e0c352d135 Merge branch 'master' into darkswarm Will Marshall 2014-01-08 14:49:47 +11:00
  • 7838d759ee Removing redundant functionality from the Order Populator Will Marshall 2014-01-08 14:45:25 +11:00
  • 5f4d787d26 Fix sorting error in spec Rohan Mitchell 2014-01-08 14:43:46 +11:00
  • c42d741d3d Remove browse product specs for removed feature Rohan Mitchell 2014-01-08 14:41:06 +11:00
  • 4a74c2624c Remove specs for removed features Rohan Mitchell 2014-01-08 14:15:06 +11:00
  • ea3e697b73 Rename method for clarity, remove outdated specs for OrderPopulator Rohan Mitchell 2014-01-08 14:14:45 +11:00
  • 20ad906f7a Fix multicart use of OrderPopulator Rohan Mitchell 2014-01-08 14:13:19 +11:00
  • dd16934496 Remove redundant serializer spec, reinstate creation of order distribution charges Rohan Mitchell 2014-01-08 13:22:34 +11:00
  • 4f7fdd430f Update failing controller spec - order needs distributor set Rohan Mitchell 2014-01-08 11:58:53 +11:00
  • df53a14d4b Remove specs that are no longer relevant - distribution selection on product page no longer present Rohan Mitchell 2014-01-08 11:51:26 +11:00
  • eda4f241e2 Remove add to cart distribution selection, remove distribution change functionality from OrderPopulator, remove now-redundant tests Rohan Mitchell 2014-01-08 11:39:05 +11:00
  • 30eb11ad84 Allow select_distribution to take no order_cycle Rohan Mitchell 2014-01-08 11:38:21 +11:00
  • ef56574d82 Pass quantity to OrderPopulator Rohan Mitchell 2014-01-08 11:37:38 +11:00
  • 458f91ef91 Add feature spec helper to select distributor and order cycle Rohan Mitchell 2014-01-08 11:31:44 +11:00
  • 2f98888acd Remove active model serializers gem Rohan Mitchell 2014-01-08 11:30:31 +11:00
  • 5e041a6f4f Uncommenting the old OP code Will Marshall 2014-01-08 10:35:27 +11:00
  • 70e16433d3 Spec for reusing existing option values Rohan Mitchell 2014-01-08 10:16:38 +11:00
  • 2fec16af5d Merge branch 'master' into product-amount-units Rohan Mitchell 2014-01-07 16:00:06 +11:00
  • 06ab4d5384 Patching some further regression bugs Will Marshall 2014-01-07 15:28:11 +11:00
  • 894f86350e Fix megalitre unit specification Rohan Mitchell 2014-01-07 15:17:32 +11:00
  • 936d80b2c5 Removing a redundant test: no longer show current distributor and order cycle Will Marshall 2014-01-07 15:16:36 +11:00
  • 042e8386ab Refactor: Extract methods to simplify Rohan Mitchell 2014-01-07 15:16:36 +11:00
  • 4d03f65766 Reworking everything to use RABL Will Marshall 2014-01-07 15:06:47 +11:00
  • 9e6fa4d22d Add spec for small values Rohan Mitchell 2014-01-07 15:02:55 +11:00
  • ebae76375f Fix specs to work with unit_value stored in base units, scale units correctly for output Rohan Mitchell 2014-01-07 14:57:30 +11:00
  • 5a1249e249 When value is blank, display description only Rohan Mitchell 2014-01-07 12:19:48 +11:00
  • 35d0bf6219 Generate option value values and units for weight, volume and items Rohan Mitchell 2014-01-07 12:07:54 +11:00
  • 32c7682da2 Removing the serializers to fix regression issues Will Marshall 2014-01-07 11:12:44 +11:00
  • 641b7dcdf4 Removing the image serializer, causing regression bugs Will Marshall 2014-01-07 11:05:10 +11:00
  • 8e0a7d9072 Pretties, fixing the email validation issue with admin authentication steps Will Marshall 2014-01-07 11:04:40 +11:00
  • ef6c08408b Generate option value name - value and description Rohan Mitchell 2014-01-07 10:57:58 +11:00
  • 9e956ebec6 Add specs for option value creation, create option values for simple case. Delete option value associations, not objects. Rohan Mitchell 2014-01-07 10:36:19 +11:00
  • 6a4c112cf2 Rename option_type_for_variant_unit to variant_unit_option_type Rohan Mitchell 2014-01-07 10:31:53 +11:00
  • 177782fac5 Status message works when updating products with filters applied Rob H 2014-01-06 18:20:00 +08:00
  • 9677ec7159 Starting to build mixins Will Marshall 2014-01-06 16:27:41 +11:00
  • 1264af584c Removing a pointless test Will Marshall 2014-01-06 15:56:28 +11:00
  • dd1b3311d7 Removing all the old order populator stuff Will Marshall 2014-01-06 15:23:21 +11:00
  • 49b9b8f635 Add messages to BPE interface for cases when 0 or > 500 products are found Rob H 2014-01-05 19:17:50 +08:00
  • 2e56d7a551 Can remove filters from BPE Rob H 2014-01-05 17:53:32 +08:00
  • fb9fd5089a WIP: Adding a hard filter to BPE works Rob H 2014-01-05 17:04:27 +08:00
  • 6445275530 Basic layout changes for BPE page Rob H 2014-01-05 00:37:36 +08:00
  • a6d7044dfd WIP: Adding basic UI for applying hard filtering to BPE Rob H 2014-01-04 19:21:10 +08:00
  • 7ef358a476 Add basic hard filter adding js infrastructure for BPE Rob H 2014-01-04 16:44:00 +08:00
  • 687332d2b0 Add loading splash to BPE Rob H 2014-01-04 15:50:26 +08:00
  • c6222f2180 BPE pagination works with filtering Rob H 2014-01-02 15:22:10 +08:00
  • 6b865aa38c Display BPE update message correctly Rob H 2014-01-02 13:10:06 +08:00
  • ef78609049 Prevent page being orphaned when changing page size in BPE Rob H 2013-12-26 19:37:21 +08:00
  • 2df0545819 Fix some outstanding updating issues in BPE Rob H 2013-12-23 23:09:19 +08:00
  • 3372f1d605 BPE page nav using page numbers Rob H 2013-12-23 17:19:38 +08:00