Commit Graph

  • 248c38fd2c Adding name and display_as fields to variants Rob H 2014-06-04 15:21:31 +10:00
  • 1a91b5a728 Move option value naming logic into separate lib class Rob H 2014-06-04 14:54:42 +10:00
  • 3b1411283a Merge branch 'master' into units Rob H 2014-06-12 12:13:44 +10:00
  • 176735544b Changing class name to remove ofn- from naming convention which call the icon font styling summerscope 2014-06-12 12:12:12 +10:00
  • c09aeeee8f Recalculate option values on variants when product variant unit is changed Rob H 2014-06-12 12:11:20 +10:00
  • 349ba112d0 Fixing map issues, adding a nice pretty loader Will Marshall 2014-06-12 11:49:40 +10:00
  • 48e2c3512f Patching a minor bug in cart emptying Will Marshall 2014-06-10 15:21:41 +10:00
  • 4e6f07de8a WIP (tests reqd): Customers and products+inventory reports handle nil order cycle times Rohan Mitchell 2014-06-11 20:36:27 +10:00
  • c2109026ca Add js spec for option value namer Rob H 2014-06-11 14:21:13 +10:00
  • 71020a14ef Fix payments coming up as $0, credit card charges failing for the same reason Rohan Mitchell 2014-06-11 12:41:08 +10:00
  • d9a5b02415 Move dynamic placeholder logic to directive so that it can be used for master variants too Rob H 2014-06-11 12:41:51 +10:00
  • 908f7871bb Orders and fulfilment report handles order cycles with nil opening or closing times Rohan Mitchell 2014-06-11 10:33:59 +10:00
  • 5f8ed01475 Adding dynamic text to display as placeholder Rob H 2014-06-06 15:43:05 +10:00
  • f688461e84 Add fields for variant display name and display as to bpe Rob H 2014-06-06 10:10:41 +10:00
  • 970b5f3061 Change variant name to display name Rob H 2014-06-05 13:39:53 +10:00
  • 2c78d537fa Use display_as as option value for variant when it is present Rob H 2014-06-04 17:23:11 +10:00
  • 227c10288d OptionValueNamer spec refactor Rob H 2014-06-04 15:39:04 +10:00
  • c915c5fe78 Adding name and display_as fields to variants Rob H 2014-06-04 15:21:31 +10:00
  • e9f2a8f2cd Move option value naming logic into separate lib class Rob H 2014-06-04 14:54:42 +10:00
  • c21342b82e Adding all fields to new admin product spec Rob H 2014-06-04 11:42:42 +10:00
  • 860360d81e Change map container name to remove ofn- which refers to icon font styling summerscope 2014-06-12 11:34:01 +10:00
  • a6e3dd65fe WIP (tests reqd): Customers and products+inventory reports handle nil order cycle times Rohan Mitchell 2014-06-11 20:36:27 +10:00
  • 4d01b55963 Merge branch 'master' into units Rob H 2014-06-11 14:21:23 +10:00
  • d8f1153817 Add js spec for option value namer Rob H 2014-06-11 14:21:13 +10:00
  • 177e03eae2 Fix payments coming up as $0, credit card charges failing for the same reason Rohan Mitchell 2014-06-11 12:41:08 +10:00
  • 8e960c817a Merge branch 'master' into units Rob H 2014-06-11 12:43:40 +10:00
  • 44f4ee822c Move dynamic placeholder logic to directive so that it can be used for master variants too Rob H 2014-06-11 12:41:51 +10:00
  • 12809438ac Orders and fulfilment report handles order cycles with nil opening or closing times Rohan Mitchell 2014-06-11 10:33:59 +10:00
  • 82da4d3911 Fixing the taxon icons to support le svgs Will Marshall 2014-06-10 15:52:27 +10:00
  • 74b3c026d2 Merging in maps Will Marshall 2014-06-10 14:54:12 +10:00
  • 75f1bf4f54 Merging in master Will Marshall 2014-06-10 14:53:49 +10:00
  • 373f698676 Adding loading infrastructure Will Marshall 2014-06-10 14:52:27 +10:00
  • 94b7601d73 Patching authorization tests Will Marshall 2014-06-10 14:01:25 +10:00
  • 21b6e91913 Moving OFN flash to fixed block Will Marshall 2014-06-10 12:29:31 +10:00
  • e806ffdd1a Merge branch 'maps' Will Marshall 2014-06-10 11:17:14 +10:00
  • 4d7fa8b1bf Removing payments when emptying order Will Marshall 2014-06-10 11:15:04 +10:00
  • dbf4f503a9 Restoring my clever flash refactoring Will Marshall 2014-06-06 16:41:28 +10:00
  • c07809d328 Rescoping the accordion as well Will Marshall 2014-06-06 16:53:09 +10:00
  • dc60409c85 Move paid column next to order totals Rohan Mitchell 2014-06-10 10:31:53 +10:00
  • c8520cedbb Fixing another merge issue Will Marshall 2014-06-06 17:26:06 +10:00
  • 7953ff145c Fixing a merge issue Will Marshall 2014-06-06 17:23:28 +10:00
  • a87361d82e Merge branch 'master' into maps Will Marshall 2014-06-06 17:21:27 +10:00
  • f068cb3cd7 Show shipping method via angular only (don't show spree's adjustment) Rohan Mitchell 2014-06-06 17:05:50 +10:00
  • be644bdcc3 Revert "Reworking flash messages hooray" Rohan Mitchell 2014-06-06 16:59:47 +10:00
  • 6c5b514b9b Rescoping the accordion as well Will Marshall 2014-06-06 16:53:09 +10:00
  • c9d0091cd9 Reworking flash messages hooray Will Marshall 2014-06-06 16:41:28 +10:00
  • 37f197205f Removing shipping method from order when emptied Will Marshall 2014-06-06 16:39:53 +10:00
  • 6e04eeba07 Adding dynamic text to display as placeholder Rob H 2014-06-06 15:43:05 +10:00
  • 0c313c0dcb Defaulting cart count to zero if undefined Will Marshall 2014-06-06 14:47:12 +10:00
  • 2545b06b2d Adding first and last name read-only fields to credit card Will Marshall 2014-06-06 14:28:33 +10:00
  • 57102f714e Switching to ng-if so CC fields aren't validated when hidden Will Marshall 2014-06-06 14:02:53 +10:00
  • 92eca72f4f Fixing a couple of paths and clearing localStorage when changing distributor Will Marshall 2014-06-06 13:57:32 +10:00
  • c32776c6b8 Disabling maps in production Will Marshall 2014-06-06 13:52:10 +10:00
  • 54cdc545a4 adding distributor id to localStorage Will Marshall 2014-06-06 13:42:43 +10:00
  • afabda788e Adding the close Will Marshall 2014-06-06 13:42:29 +10:00
  • 74b9810d22 Removing image from about us Will Marshall 2014-06-06 13:26:04 +10:00
  • c09ffa832c Fixing gmaps Will Marshall 2014-06-05 17:16:19 +10:00
  • ebe40d3b3d New icon Will Marshall 2014-06-05 17:14:11 +10:00
  • f881197a74 New icons and some more enterprise data Will Marshall 2014-06-05 17:12:38 +10:00
  • ddb5150e77 Automatically resizing to fit Will Marshall 2014-06-05 16:49:01 +10:00
  • 6f2e841100 Adding modals for the map Will Marshall 2014-06-05 16:23:43 +10:00
  • c9c1b4709b Basic but hacky way to get events out of map Will Marshall 2014-06-05 15:08:50 +10:00
  • 82ab14a33e Starting on on the map Will Marshall 2014-06-05 12:18:26 +10:00
  • 0c501b58a5 Adjust layout for 12 column grid for Hub details and order cycle info plus adjust CSS to allow for different break points summerscope 2014-06-06 11:19:15 +10:00
  • 43c5c37326 Add fields for variant display name and display as to bpe Rob H 2014-06-06 10:10:41 +10:00
  • 8a87e5e545 Add in link to map page for homepage pane summerscope 2014-06-06 10:03:51 +10:00
  • 634af96a66 Update reports controller spec for multi-order-cycle params Rohan Mitchell 2014-06-05 17:02:50 +10:00
  • 1d44cbf506 Show distribution charge on report Rohan Mitchell 2014-06-05 16:52:39 +10:00
  • 1a7b32d1ff Show hub and customer name on total row Rohan Mitchell 2014-06-05 16:02:09 +10:00
  • 673293f273 Add extra shipping columns Rohan Mitchell 2014-06-05 15:48:58 +10:00
  • 13e2da42eb Add producer column, remove Packed? and Shipped? columns Rohan Mitchell 2014-06-05 15:20:52 +10:00
  • 1fab8c1e01 In orders and fulfilment reports, rename distributor -> hub and supplier -> producer Rohan Mitchell 2014-06-05 15:02:54 +10:00
  • e5f0818065 Order and fulfilment reports can filter by multiple hubs, producers and order cycles Rohan Mitchell 2014-06-05 14:56:46 +10:00
  • f8fa014796 LineItem.supplied_by_any Rohan Mitchell 2014-06-05 14:29:40 +10:00
  • 590ac6aa6d Put orders and fulfilment report in grid layout Rohan Mitchell 2014-06-05 12:56:54 +10:00
  • 6c68937230 Fixing gmaps Will Marshall 2014-06-05 17:16:19 +10:00
  • c75da1ce0d New icon Will Marshall 2014-06-05 17:14:11 +10:00
  • d85c89b5d2 Merge branch 'master' into maps Will Marshall 2014-06-05 17:12:40 +10:00
  • 8b1c2b1e9e New icons and some more enterprise data Will Marshall 2014-06-05 17:12:38 +10:00
  • b1b80a1e39 Automatically resizing to fit Will Marshall 2014-06-05 16:49:01 +10:00
  • 5ffb8decf5 Adding modals for the map Will Marshall 2014-06-05 16:23:43 +10:00
  • 3ae1eb863d Update behaviour on Place Order Now button so it is disabled but not hidden when unavailable summerscope 2014-06-05 16:20:14 +10:00
  • 7b1756fc98 Fix column layout issue for checkout page making content expand beyond page boundaries summerscope 2014-06-05 16:19:35 +10:00
  • 68311ca699 Remove Facebook icon which appeared here - unnecessary. summerscope 2014-06-05 15:53:23 +10:00
  • 2984cada53 Remove Admin link from left menu as this now lives in the drop-down menu for logged in users under Cog icon to right. summerscope 2014-06-05 15:51:23 +10:00
  • 1ab0d6816c Merge branch 'laura_and_will' into maps Will Marshall 2014-06-05 15:50:53 +10:00
  • 843ea9faef Basic but hacky way to get events out of map Will Marshall 2014-06-05 15:08:50 +10:00
  • 05c62634fc Further overlapping elements fixes Rohan Mitchell 2014-06-05 14:49:41 +10:00
  • 2bedc431e8 Fix spec fragility - overlapping elements error Rohan Mitchell 2014-06-05 13:43:41 +10:00
  • 1eac76fbba Change variant name to display name Rob H 2014-06-05 13:39:53 +10:00
  • 476eeef69d Starting on on the map Will Marshall 2014-06-05 12:18:26 +10:00
  • 566afc0b75 Merge branch 'laura_and_will' Rohan Mitchell 2014-06-05 11:42:02 +10:00
  • f28d9f9d9b Fix distributor logo spec - Add a logo Rohan Mitchell 2014-06-05 11:38:27 +10:00
  • 4a7609a835 Basic styling for checkout credit card form Rohan Mitchell 2014-06-05 11:17:53 +10:00
  • fc02e7857a Merge branch 'master' into laura_and_will Will Marshall 2014-06-04 17:24:30 +10:00
  • 3240a4e08e Use display_as as option value for variant when it is present Rob H 2014-06-04 17:23:11 +10:00
  • 69e5459afd Finishing off the merge with localStorage refactoring with sekrets Will Marshall 2014-06-04 17:22:10 +10:00
  • 039108a07d Styling label on taxons on fat view of active table for hubs (add a little padding to right) summerscope 2014-06-04 17:16:47 +10:00
  • 3c21ce8d99 Returning to the basic flash for now Will Marshall 2014-06-04 17:11:02 +10:00
  • cd09f70ed3 Compacting down our flash messages Will Marshall 2014-06-04 16:38:49 +10:00