Commit Graph

  • 0032a806b5 Further work on Darkswarm Will Marshall 2013-12-04 14:12:13 +11:00
  • 987ba1a81a Adding a monkeypatch to spree to always allow SSL Will Marshall 2013-12-04 14:08:08 +11:00
  • ff003d8931 disabling SSL :/ Will Marshall 2013-12-04 13:42:35 +11:00
  • f0e847a9f1 Merge branch 'master' into ui_setup Will Marshall 2013-12-04 13:09:48 +11:00
  • 9efd7c2d69 Getting the darkswarm build flow up and running. Like a boss Will Marshall 2013-12-04 13:09:30 +11:00
  • c2d3e8bcec Forcing staging to SSL Will Marshall 2013-12-04 13:08:28 +11:00
  • 3d019bdcd5 Starting to partialise things Will Marshall 2013-11-29 16:52:14 +11:00
  • 175cd86976 Adding darkswarm basics Will Marshall 2013-11-29 16:38:14 +11:00
  • a8a12d6d04 Adding some magical guard unicorn sparkles Will Marshall 2013-11-29 16:11:56 +11:00
  • e574185c95 Fixing an ordering issue in the order cycle spec Will Marshall 2013-11-29 14:48:06 +11:00
  • 0ac9bfd898 Moving our fix for the broken Spree function into our own JS Will Marshall 2013-11-29 14:24:56 +11:00
  • 0cfc0efe32 Overriding the broken _destroy partial so failure to destroy is shown as intended Will Marshall 2013-11-29 12:32:39 +11:00
  • 6608b6e1ad Remove some angular testing crud, integrate with regular rails config and script dirs Rohan Mitchell 2013-11-29 11:12:24 +11:00
  • 29308dca76 Enable order cycles by default Rohan Mitchell 2013-11-29 10:49:33 +11:00
  • 33b23dd265 Sorting the bitching product report like a boss Will Marshall 2013-11-28 17:06:06 +11:00
  • 13e991d02d Changing favicon Will Marshall 2013-11-28 16:52:54 +11:00
  • 7784a6ef44 Adding a default value of NOW to available_on on Products Will Marshall 2013-11-28 16:41:46 +11:00
  • dec33ebda4 Fixing the HTML in the admin section Will Marshall 2013-11-28 16:13:13 +11:00
  • 69459847ca Fixing some responsiveness issues on the home page Will Marshall 2013-11-28 15:42:00 +11:00
  • acdbbb153d Fixing up the landing page spec to cover the new login text Will Marshall 2013-11-28 15:24:38 +11:00
  • 7742fdc27a Adding a better homepage login function Will Marshall 2013-11-28 15:01:57 +11:00
  • 7bc754a598 Adding filtering to the products page Will Marshall 2013-11-28 13:34:03 +11:00
  • d39cb74d06 Merge branch 'customers' Will Marshall 2013-11-22 16:55:11 +11:00
  • 27f99d1383 Working version of Customers reports without filters Will Marshall 2013-11-22 16:53:57 +11:00
  • fbe0e2cc29 Basic plumbing for the Customers in place Will Marshall 2013-11-22 16:22:44 +11:00
  • 51ea6fcd67 Starting on the Customers Report Will Marshall 2013-11-22 14:57:11 +11:00
  • b3bf3a8378 Adding the plumbing for Customers reports, and one tiny refactor to products Will Marshall 2013-11-22 14:54:50 +11:00
  • 4898460132 Fix failing spec with table reorder, lambda-fy scopes that use time Rohan Mitchell 2013-11-22 14:00:04 +11:00
  • 94c33e5f45 Colour order cycle rows based on their status Rohan Mitchell 2013-11-22 11:31:04 +11:00
  • 459b2c1050 Add #upcoming? and #open? to OrderCycle Rohan Mitchell 2013-11-22 11:15:12 +11:00
  • 3a2394675f Rename OrderCycle#expired? to #closed? Rohan Mitchell 2013-11-22 11:08:42 +11:00
  • 5ad63d08f3 Add some more open/close time scopes to order cycles Rohan Mitchell 2013-11-22 10:57:33 +11:00
  • f75879bec1 Put order cycle variants in a tooltip Rohan Mitchell 2013-11-22 10:03:49 +11:00
  • 5e170a843e Forcing a rebuild on Jenkins Will Marshall 2013-11-21 17:22:47 +11:00
  • c695bafe69 Reworking the way the Reports works so we have more granular control over what shows Will Marshall 2013-11-21 16:45:59 +11:00
  • beb6110bc3 Fixing up a bug in the aggregate filtering Will Marshall 2013-11-21 14:53:17 +11:00
  • b101a37dad Rearrange columns Rohan Mitchell 2013-11-21 14:42:18 +11:00
  • dfcf567f26 Sort payment methods by name Rohan Mitchell 2013-11-21 14:35:37 +11:00
  • 612a80ec15 A little refactoring, some comment removal Will Marshall 2013-11-21 14:28:23 +11:00
  • f642d6532a Removing reundant Group Buys spec now we've removed Group Buys Will Marshall 2013-11-21 14:06:46 +11:00
  • d703e1836f Working build of P&I report Will Marshall 2013-11-21 14:06:24 +11:00
  • e853c1275e Working filters for Product&Inventory Report Will Marshall 2013-11-21 11:25:37 +11:00
  • ca16314535 Working scopes for child variant and master variants Will Marshall 2013-11-20 14:11:22 +11:00
  • 84346c7fbd Starting specing P&I Report Will Marshall 2013-11-20 13:59:02 +11:00
  • 6a11b2685f Controller plumbing for Product & Inventory report Will Marshall 2013-11-20 13:58:01 +11:00
  • 5772fa9589 Boilerplate for the new Product and Inventory report, sans any functionality Will Marshall 2013-11-20 10:34:18 +11:00
  • 306eaab262 Remove uservoice Rohan Mitchell 2013-11-15 16:31:46 +11:00
  • 7a8bd16083 On enterprise page, do not display products outside of the outgoing exchange Rohan Mitchell 2013-11-15 15:08:45 +11:00
  • 59935619e3 Rename OrderCycle#distributed_variants_by to variants_distributed_by Rohan Mitchell 2013-11-15 14:34:05 +11:00
  • 52b6c33aaa When converting an exchange to a hash for comparison, ensure id lists are sorted - ordering issues should not indicate inequality Rohan Mitchell 2013-11-15 11:40:09 +11:00
  • d73af509e0 When removing exchanges from an order cycle, compare by id only. Avoids erroneously removing exchanges where another attr has changed in an unimportant way. Rohan Mitchell 2013-11-15 11:31:08 +11:00
  • 8980284390 Reorder OC admin index table columns Rohan Mitchell 2013-11-15 11:28:47 +11:00
  • daee827af6 Generalise db remote backup script, add restore script Rohan Mitchell 2013-11-15 10:42:58 +11:00
  • 2ce687fc79 Adding variant update permissions to Enterprise users Will Marshall 2013-11-14 11:53:14 +11:00
  • 9097246301 Removing uservoice Will Marshall 2013-11-14 11:07:58 +11:00
  • 27b892851a Enabling bugherd in Production Will Marshall 2013-11-14 11:02:20 +11:00
  • 281220c490 Updating a few gems Will Marshall 2013-11-13 16:25:06 +11:00
  • a4f2ea771d Fixing the bulk update spec Will Marshall 2013-11-13 16:24:09 +11:00
  • 27b8c4508f Split product distribution editing into its own admin page Rohan Mitchell 2013-11-13 15:22:17 +11:00
  • 713742f016 Adding back in an important ID Will Marshall 2013-11-08 17:16:45 +11:00
  • b7104add1c Patching up the footer, partialising it Will Marshall 2013-11-08 16:37:02 +11:00
  • b227be4a62 Adding an override to suppress the products display unless we actually have an order_cycle in play Will Marshall 2013-11-08 16:04:22 +11:00
  • 283401d6fe Fix checkout confirmation page blank (access denied) when checking out anonymously - BugHerd #139 Rohan Mitchell 2013-11-08 15:27:11 +11:00
  • 317b2f1ced Helperizing some of the order cycles stuff Will Marshall 2013-11-08 15:19:27 +11:00
  • b1d064c964 Adding some fancy new partials for the order cycle selection logic Will Marshall 2013-11-08 11:27:13 +11:00
  • 6582ed0753 Removing an extraneous check on the order cycle from line 4, partialising Will Marshall 2013-11-08 11:26:36 +11:00
  • 71d6e51078 Put distributors column second, no need to explicitly set column widths, so remove this Rohan Mitchell 2013-11-07 16:25:34 +11:00
  • 48f18a93de Order shipping methods by name, not distributor Rohan Mitchell 2013-11-07 16:17:37 +11:00
  • 0755b515d1 Only show shipping methods that enterprise user has access to Rohan Mitchell 2013-11-07 11:56:45 +11:00
  • a526439643 Moving the orders controller spec into the right place Will Marshall 2013-11-07 15:13:07 +11:00
  • b7c7730278 Patching a bug in which we'd 404 if deleting items from a cart twice in parallel Will Marshall 2013-11-07 15:12:28 +11:00
  • f0d335a454 Fixing up the failing spec for distributor changes, reworking a method to SharedHelper Will Marshall 2013-11-07 11:47:05 +11:00
  • e33ff15151 Adding a small override to unbreak the New Product link Will Marshall 2013-11-06 16:28:41 +11:00
  • 04387aa6b7 Scope time since last oc expired to distributor Rohan Mitchell 2013-11-06 16:17:27 +11:00
  • d95394f70d Adding tooltips to the footer link Will Marshall 2013-11-06 15:56:00 +11:00
  • 406f8033fe Partialising the _distributor render Will Marshall 2013-11-06 15:36:39 +11:00
  • f9a4718bdd Reworking the homepage styles to work on mobile as well as screen Will Marshall 2013-11-06 14:14:55 +11:00
  • 0784642517 Removing the copyright from the footer Will Marshall 2013-11-06 13:40:05 +11:00
  • 59b6badcd6 Small text change on the order confirmation screen Will Marshall 2013-11-06 13:28:54 +11:00
  • 3c37696882 Adding specs and implementation: moving current distributor to new empty order after checkout Will Marshall 2013-11-06 12:35:11 +11:00
  • 72efb2096b Remove comment - everything makes sense now Rohan Mitchell 2013-11-06 11:25:57 +11:00
  • bef64e5967 Making sure the final row has a bottom border Will Marshall 2013-11-06 11:18:34 +11:00
  • 91abf4fab1 Reworking the temp homepage to use the Foundation styles more cleverly Will Marshall 2013-11-06 11:16:29 +11:00
  • 263195c8b9 Merging Will Marshall 2013-11-06 10:59:56 +11:00
  • 71af58239e Making the 'next order cycle' text big and black Will Marshall 2013-11-06 10:58:09 +11:00
  • fd43227921 Explicitly precompile style needed Rohan Mitchell 2013-11-06 10:42:39 +11:00
  • bacd8401b4 Compile all admin css files for manual inclusion (fixes BugHerd #126) Rohan Mitchell 2013-11-06 10:18:45 +11:00
  • 6e0dfbd88b Make order cycle admin open and close time columns wider Rohan Mitchell 2013-11-01 16:50:23 +11:00
  • 7d21dd053a Merging Will Marshall 2013-11-01 16:50:28 +11:00
  • 8f27c7be80 Fixing a clearing bug on the home page Will Marshall 2013-11-01 16:49:28 +11:00
  • 6aad840d05 Change inaccurate wording - this lists order cycles by closing date, not availability date Rohan Mitchell 2013-11-01 16:37:49 +11:00
  • 25b0306a93 Ensure css is precompiled, reformat configs Rohan Mitchell 2013-11-01 11:09:23 +11:00
  • 9f150c8d87 Adding a small display on the distributor page indicating when the next order cycle is, if any - BugHerd#127 Will Marshall 2013-11-01 16:12:31 +11:00
  • 37b81af91c Adding myself to the Readme as a contributor Will Marshall 2013-11-01 14:49:58 +11:00
  • b8fcfbd72b Test and implementation: dropping inclusion of product_distributions from active Distributors on front page - BugHerd#125 Will Marshall 2013-11-01 14:48:23 +11:00
  • 26f2d27d64 Updating therubyracer to fix mac compatibility with libv8 Will Marshall 2013-11-01 14:46:41 +11:00
  • 3d07d68637 Order landing page distributors by name Rohan Mitchell 2013-10-31 16:28:04 +11:00
  • 34638c0bf9 Remove pry from spec Rohan Mitchell 2013-10-31 16:27:13 +11:00
  • 094485bc2d Sort enterprises by name, display direct-from-the-farm links separately at top Rohan Mitchell 2013-10-31 15:52:22 +11:00
  • eb997c94a2 Mark inactive distributors on supplier distributors list Rohan Mitchell 2013-10-31 14:59:47 +11:00