Commit Graph

  • ffbfbffb28 WIP: Add basic page nav controls to BPE Rob H 2013-12-23 09:22:31 +08:00
  • 06995bd3c6 Add controls to alter the number of products displayed for BPE Rob H 2013-12-22 17:31:27 +08:00
  • 530d38c7d0 Add basic pagination informaion to BPE Rob H 2013-12-22 16:58:48 +08:00
  • 49c2cc3696 Getting in the tab navigation Will Marshall 2013-12-20 14:23:14 +11:00
  • 0db7eae7f8 Getting images working Will Marshall 2013-12-20 11:49:08 +11:00
  • 751e98443f Removing LOADS of code Will Marshall 2013-12-19 16:47:27 +11:00
  • e20120b9ca Fixing a syntax error Will Marshall 2013-12-19 16:05:35 +11:00
  • 985cebb44a Massaging the form to push orders to the cart: some refactoring still required Will Marshall 2013-12-19 15:51:51 +11:00
  • 1048bab303 Patching up some edge cases Will Marshall 2013-12-19 14:20:16 +11:00
  • 87cef4edcc Reverting previous commit Will Marshall 2013-12-19 12:29:21 +11:00
  • aaa2999ee1 Dropping our override of ActionMailer Will Marshall 2013-12-19 11:58:21 +11:00
  • 37f8ce68fb Adding one additional mailer test Will Marshall 2013-12-19 11:58:08 +11:00
  • b5dd921a81 Our feature spec is breaking but we'll work that out Will Marshall 2013-12-19 10:44:47 +11:00
  • b3a4d826b8 Dumping OrderCycle data via :javascript tags instead of ng-init, Angularising the selector stuff Will Marshall 2013-12-18 17:05:47 +11:00
  • 1f012dc52c Patching up the tests to check on our serialisers Will Marshall 2013-12-18 16:15:23 +11:00
  • 6d124b3275 Failing tests, forcing the orders close text to change Will Marshall 2013-12-18 16:12:06 +11:00
  • 21d99c8e56 Directing our form to the order populator Will Marshall 2013-12-18 15:17:08 +11:00
  • 4b7605212e Adding text trunctation in Angular Will Marshall 2013-12-18 14:45:32 +11:00
  • adbfdafff3 Lots of styling improvements Will Marshall 2013-12-18 13:13:58 +11:00
  • a3dfe1b147 Working on the HTML structure, variants etc Will Marshall 2013-12-18 12:26:34 +11:00
  • e23b33ab48 Adding variants display Will Marshall 2013-12-18 11:35:25 +11:00
  • 3ed8dc5a7d Tiny typography change Will Marshall 2013-12-17 15:56:36 +11:00
  • f146610a93 Fixing a recursion bug in Angular Will Marshall 2013-12-17 15:52:21 +11:00
  • 7ea9cf6862 Adding price to serializer Will Marshall 2013-12-17 15:45:06 +11:00
  • 9f47ff64fa Update spec now that bulk product edit is the default product edit view Rohan Mitchell 2013-12-17 15:29:25 +11:00
  • 67fcf0f534 Fixing up the feature specs Will Marshall 2013-12-17 15:26:49 +11:00
  • 3c95993975 Remove order sensitivity in specs Rohan Mitchell 2013-12-17 15:25:17 +11:00
  • c4c5f3a8c7 Merging from master Will Marshall 2013-12-17 14:18:21 +11:00
  • ece46811f9 Adding serializers also Will Marshall 2013-12-17 14:04:36 +11:00
  • 843a1133ef Moving to use custom serializers for ze JSON API Will Marshall 2013-12-17 13:48:08 +11:00
  • e443495a7e Remove reference to deleted stylesheet Rohan Mitchell 2013-12-17 12:48:44 +11:00
  • f1f3d7a99c Remove duplicate migration Rohan Mitchell 2013-12-13 16:01:29 +11:00
  • 5c744c7295 Move enterprises_distributor_info_rich_text_feature styles into central files Rohan Mitchell 2013-12-13 15:59:59 +11:00
  • 222ed20361 Defaulting to bulk products Will Marshall 2013-12-13 15:57:32 +11:00
  • 63349c7c9a Fixing some breaking bugs in the refactored mailer Will Marshall 2013-12-13 15:38:27 +11:00
  • f6af9e78ac Adding destroy ability to enterprise users Will Marshall 2013-12-13 15:05:07 +11:00
  • 92b3d496a4 Fixing the bugherd script to use the production one Will Marshall 2013-12-13 15:00:56 +11:00
  • 12743850b4 Removing a chili, refactoring order mailer Will Marshall 2013-12-13 14:57:27 +11:00
  • 124b6df75d Show undated order cycles on index page Rohan Mitchell 2013-12-13 14:51:43 +11:00
  • 1084862139 When product variant unit is changed, remove related option values from variants Rohan Mitchell 2013-12-13 12:08:51 +11:00
  • 6e36142809 Making some changes to the data on the products inventory page Will Marshall 2013-12-13 11:39:45 +11:00
  • 60a3e06c5b Reformat Rohan Mitchell 2013-12-13 11:10:08 +11:00
  • f2269654ff Set option type on product when variant unit changed Rohan Mitchell 2013-12-13 11:07:57 +11:00
  • e98031e581 Fixing some minor report bugs Will Marshall 2013-12-13 10:12:41 +11:00
  • d5081e4cc5 Working on the pretties Will Marshall 2013-12-13 09:19:54 +11:00
  • 03aa5604e5 Reorder columns on BPE Rohan Mitchell 2013-12-12 10:52:17 +11:00
  • a67c7b808d Do not set unit value or description on variant when unpacked field is undefined Rohan Mitchell 2013-12-12 10:50:03 +11:00
  • 36694822db Starting to prettify Will Marshall 2013-12-12 10:28:43 +11:00
  • 42d3947861 Set unit value and description on variants Rohan Mitchell 2013-12-12 10:14:05 +11:00
  • 8f41078c0c Reworking our bindings so everything stacks on objects and automagically updates Will Marshall 2013-12-11 15:39:50 +11:00
  • bc4f472523 Fixing up the tests with some refactoring Will Marshall 2013-12-11 15:33:57 +11:00
  • 71a5d84a1d Filtering the products to the current order cycle Will Marshall 2013-12-11 15:06:07 +11:00
  • 3903173848 Working reloading of products, changing order cycles, sticky state Will Marshall 2013-12-11 13:36:12 +11:00
  • 04d8949177 Tweaks to the JS, redirection on the controller Will Marshall 2013-12-11 12:53:50 +11:00
  • 44fe304efb Building out and testing our Product and OrderCycle Angular stuff Will Marshall 2013-12-11 12:42:33 +11:00
  • 4db8f755bf Getting an order cycle update function in place like a boss Will Marshall 2013-12-11 12:42:02 +11:00
  • 33f06f5eff Display unit value and description for variants in BPE Rohan Mitchell 2013-12-06 15:57:37 +11:00
  • 63dfa0b696 Getting the test framework set up for Angular, setting up a products fetch stub Will Marshall 2013-12-06 15:24:42 +11:00
  • 385a80a305 Revert "Can set variant_unit_name when unit type is not items" - this applies to a different field. Rohan Mitchell 2013-12-06 14:38:46 +11:00
  • 3013870bd6 Merge branch 'master' into product-amount-units Rohan Mitchell 2013-12-06 14:33:59 +11:00
  • 6956eb3f94 Basic styling for variant unit fields on BPE Rohan Mitchell 2013-12-06 14:30:38 +11:00
  • 8f6f37355c Can set variant_unit_name when unit type is not items Rohan Mitchell 2013-12-06 14:25:19 +11:00
  • 5e086af27a Update product variant_unit_name when variant unit is items Rohan Mitchell 2013-12-06 13:16:33 +11:00
  • 4e1a1825e6 Fix incorrect prefix on track-product Rohan Mitchell 2013-12-06 13:14:55 +11:00
  • b21263e1c0 Display text field for variant_unit_name Rohan Mitchell 2013-12-06 12:06:16 +11:00
  • e70513b06c Remove off-canvas class for landing page, allowing it to scroll Rohan Mitchell 2013-12-06 11:47:07 +11:00
  • 3adeed1fa0 Update attr name Rohan Mitchell 2013-12-06 11:11:19 +11:00
  • b806947e7b Merge branch 'master' into darkswarm Will Marshall 2013-12-06 11:08:17 +11:00
  • fdc98ba24c Convert Karma config file to v0.10 compatible format Rohan Mitchell 2013-11-29 16:44:27 +11:00
  • 62ca121db2 Rename directives to avoid using the ng namespace, which is reserved for angular core Rohan Mitchell 2013-12-06 10:49:06 +11:00
  • a4edacc138 Change to double quotes for spec names Rohan Mitchell 2013-12-06 10:41:28 +11:00
  • d9d6d48ede Centralise ctrl calls Rohan Mitchell 2013-12-06 10:14:38 +11:00
  • 3670d68265 Correctly failing tests forcing us to build out OrderCycle switching in Angular Will Marshall 2013-12-05 16:48:29 +11:00
  • 102cb62b60 Starting to build out the Angular.js app Will Marshall 2013-12-05 16:31:22 +11:00
  • 3cda12b8dd Refactoring the order cycle partials Will Marshall 2013-12-05 16:31:12 +11:00
  • 165513fdea Adding some feature tests for the basic products page Will Marshall 2013-12-05 16:30:59 +11:00
  • 3f4f5143ff Refactoring the order cycle partials Will Marshall 2013-12-05 16:30:39 +11:00
  • 84fe6706a2 Make 'Items' option appear in variant_unit field on BPE Rohan Mitchell 2013-12-05 15:50:08 +11:00
  • 8af7c57a88 Pack variant_unit fields back into products and dirtyProducts. These fields can now round-trip to the server. Rohan Mitchell 2013-12-05 15:16:30 +11:00
  • f07fb8d533 Make variant unit fields attr_accessible Rohan Mitchell 2013-12-05 14:48:01 +11:00
  • e3043cc6ae Rename prepareProductsForSubmit to submitProducts Rohan Mitchell 2013-12-05 11:01:23 +11:00
  • fefea54375 Do not include variant_unit_with_scale in product update check. When saving products, save variant_unit and variant_unit_scale. Rohan Mitchell 2013-12-04 16:34:11 +11:00
  • 2115e33189 Use == instead of is Rohan Mitchell 2013-12-04 14:41:05 +11:00
  • 0a07f38f15 Load and display variant_unit on BPE page Rohan Mitchell 2013-12-04 14:24:35 +11:00
  • 2a989652cb Use ||= Rohan Mitchell 2013-12-04 12:00:04 +11:00
  • d552e84302 Tweak formatting Rohan Mitchell 2013-12-04 11:47:39 +11:00
  • 21154a9455 Convert bulk product update spec to coffeescript Rohan Mitchell 2013-11-29 16:45:19 +11:00
  • cee54b4785 Convert Karma config file to v0.10 compatible format Rohan Mitchell 2013-11-29 16:44:27 +11:00
  • a8668e24e3 Finish converting bulk product update to coffeescript Rohan Mitchell 2013-11-29 11:46:36 +11:00
  • 634dd52a80 WIP: Convert bulk product update to coffeescript. 3 tests failing. Rohan Mitchell 2013-11-29 11:27:15 +11:00
  • 1b63546a9e Master variants are valid without unit value or description Rohan Mitchell 2013-11-29 09:59:39 +11:00
  • 4c72170742 Remove unnecessary require Rohan Mitchell 2013-11-29 09:58:32 +11:00
  • 0bae3e58b8 Add product units and amount fields to product and variant models, add validations Rohan Mitchell 2013-11-28 17:02:42 +11:00
  • 7e9f389900 Getting the order cycles dropdown rendering correctly Will Marshall 2013-12-05 15:15:15 +11:00
  • ec72e9137a We can now hit the index page Will Marshall 2013-12-05 15:07:46 +11:00
  • 4543e08872 Renaming everything to Shop Will Marshall 2013-12-05 13:40:05 +11:00
  • f525b7aea1 Adding the distributors controller Will Marshall 2013-12-04 15:58:25 +11:00
  • 720d66b379 Merge branch 'master' into ui_setup Will Marshall 2013-12-04 14:28:20 +11:00
  • 578651ddae forcing SSL in staging Will Marshall 2013-12-04 14:26:22 +11:00
  • 9876a5f27b Merge branch 'master' into ui_setup Will Marshall 2013-12-04 14:13:06 +11:00