Commit Graph

  • 3c7f5e9158 Adding new mechanism to hubs/fat Will Marshall 2014-06-19 12:54:06 +10:00
  • b8cc2de91e Merge branch 'master' into laura_and_will Will Marshall 2014-06-19 12:49:58 +10:00
  • f1c4ee6744 Fixing up hub modal Will Marshall 2014-06-19 12:49:28 +10:00
  • 3b4e600599 Changing producer to enterprise Will Marshall 2014-06-19 12:39:35 +10:00
  • 58e810a736 Using enterprise in modals Will Marshall 2014-06-19 12:38:30 +10:00
  • 738fdfcd49 Merge branch 'laura_and_will' Will Marshall 2014-06-19 12:11:12 +10:00
  • 8fcc2b0c62 Merge branch 'refactoring_services' into laura_and_will Will Marshall 2014-06-19 12:10:28 +10:00
  • 5d71af7687 fixing issue 750 Will Marshall 2014-06-13 14:31:55 +10:00
  • 8905b45333 Fixing a minor regression Will Marshall 2014-06-19 12:10:05 +10:00
  • b9561ecf20 Minor refactoring from code review with Rohan Will Marshall 2014-06-19 11:41:24 +10:00
  • 47775b13fc Tweak IE old warning css to remove css anims (not supported old browsers anyway) summerscope 2014-06-19 11:32:30 +10:00
  • b0b8e14adb Tweak IE old warning message for stakeholder feedback summerscope 2014-06-19 11:30:41 +10:00
  • 2f2e0d41af On customer reports, do not show orders through a hub that the current user does not manage Rohan Mitchell 2014-06-19 10:35:32 +10:00
  • 3b7fc9f105 Reword spec descriptions Rohan Mitchell 2014-06-19 10:03:05 +10:00
  • 710abf96eb Changing Producer modal markup to reflect new design. WIP commit, summerscope 2014-06-18 18:53:31 +10:00
  • a62ab98f53 Update images styling to make more generic / modular and remove styling specific to producers to make more scalable. summerscope 2014-06-18 18:53:02 +10:00
  • f89418c0d6 Update follow markup to reflect new design WIP commit summerscope 2014-06-18 18:52:29 +10:00
  • 54983845c4 Update contact markup to reflect new design summerscope 2014-06-18 18:52:07 +10:00
  • fcd0096843 Changing markup to Hub modal (map) to reflect new design summerscope 2014-06-18 18:50:59 +10:00
  • e924d8d5dc Adding stylesheet to manage modals for Hubs and Producers summerscope 2014-06-18 18:50:40 +10:00
  • c02c7cf7ca Further patches to the damned RABL system, patching everything up to use our new Service structure Will Marshall 2014-06-18 17:54:13 +10:00
  • 2dcdd997a2 Turn off IE message ready for logic summerscope 2014-06-18 17:14:20 +10:00
  • 83e7225ef8 Add browser logos for IE message summerscope 2014-06-18 17:11:57 +10:00
  • 4d6a92dfe4 Update markup to include links to modern browsers for upgrade summerscope 2014-06-18 17:11:08 +10:00
  • 2acf3bf382 Styling for old IE upgrade / warning message summerscope 2014-06-18 17:10:47 +10:00
  • 224a70c11f Refactoring JSON injection a bit further Will Marshall 2014-06-18 16:43:57 +10:00
  • 4eee7d4901 Enterprise user can manage their enterprises' producer properties Rohan Mitchell 2014-06-18 16:04:41 +10:00
  • 45404f1475 Adding dereferencing on construct to Enterprises service - this is MAGIC Will Marshall 2014-06-18 15:48:24 +10:00
  • cf4e7b18b4 Redirect to enterprises index page after updating producer properties Rohan Mitchell 2014-06-18 15:43:22 +10:00
  • deb6c8a05a Refactoring the RABL injection and the Hubs/Producers/Enterprises services Will Marshall 2014-06-18 15:40:02 +10:00
  • c3cec34186 Redirect to enterprises page after updating producer properties Rohan Mitchell 2014-06-18 15:15:00 +10:00
  • e6674d43fa Admin can reorder producer properties Rohan Mitchell 2014-06-18 15:10:46 +10:00
  • 27fa93dbb4 Admin can remove producer properties Rohan Mitchell 2014-06-18 14:45:43 +10:00
  • 94c42abf56 Admin can update producer properties Rohan Mitchell 2014-06-18 12:34:42 +10:00
  • 84cd56cfdc Admin can list and create producer properties Rohan Mitchell 2014-06-18 12:20:01 +10:00
  • 92e3546a76 Retrieve properties for a product as a hash Rohan Mitchell 2014-06-13 11:49:40 +10:00
  • 0139c4bda2 Set producer property Rohan Mitchell 2014-06-13 11:49:13 +10:00
  • 9d8629f41f Add producer property model Rohan Mitchell 2014-06-13 11:47:34 +10:00
  • 6809d70397 Redirect user back to enterprise edit page after saving Rob H 2014-06-18 13:18:33 +10:00
  • e7c301da83 Reworking the RABL templates for simplicity AND fixing up all the tests Will Marshall 2014-06-18 13:05:44 +10:00
  • 65a0e4707a Add text which explains cropping of promo image Rob H 2014-06-18 12:58:32 +10:00
  • 3884b0cc1b Adding a direct link to shopfront to enterprise edit page for distributor enterprises Rob H 2014-06-18 12:37:26 +10:00
  • e200b192d4 Tweak styling and add animation-in function for Loading text message summerscope 2014-06-18 12:37:11 +10:00
  • 45b16d52dd Add visible checkbox to enterprises index page to allow bulk editing of visibility Rob H 2014-06-18 11:44:47 +10:00
  • 2e749ef1f3 Move admin enterprises index to haml Rob H 2014-06-18 11:08:00 +10:00
  • 0611947306 Merge branch 'master' into sm-makeover Rob H 2014-06-18 10:39:40 +10:00
  • bd41ee8b97 Commit schema version Rob H 2014-06-18 10:38:59 +10:00
  • 004548a4fe Rearrange shipping method edit page Rob H 2014-06-18 10:21:21 +10:00
  • f54834da01 Changing our composition of producers and hubs Will Marshall 2014-06-17 16:33:43 +10:00
  • 37fee5c316 Reworking the empties cart and active table link stuff Will Marshall 2014-06-17 16:33:31 +10:00
  • 57c5c2d411 Changing icon markup Will Marshall 2014-06-17 14:34:38 +10:00
  • 9bbfc0a393 Starting a set of small functional changes Will Marshall 2014-06-17 12:35:03 +10:00
  • e697a544e5 Merge branch 'master' into laura_and_will Will Marshall 2014-06-17 11:45:04 +10:00
  • 80f26c7457 Tweak label until shipping methods are available summerscope 2014-06-17 10:50:47 +10:00
  • 923a615dfa Site tagline constrain width on large screens to improve text flow summerscope 2014-06-14 21:00:32 +10:00
  • 5f155df42a Making input label in shopfront small to distinguish from variant name and price summerscope 2014-06-13 14:32:06 +10:00
  • 17682dbc58 fixing issue 750 Will Marshall 2014-06-13 14:31:55 +10:00
  • d6098ec2de Fixing a private method Will Marshall 2014-06-13 14:23:44 +10:00
  • b069311475 New animation mixin summerscope 2014-06-13 14:20:58 +10:00
  • f1497c9c5a Remove SVG styling from this scss - now in taxons.css.sass summerscope 2014-06-13 14:20:47 +10:00
  • 3f72c8601b Remove SVG styling from this scss - now in taxons.css.sass summerscope 2014-06-13 14:20:31 +10:00
  • cad8f8a7a8 New stylesheet to style taxon SVG icons summerscope 2014-06-13 14:20:10 +10:00
  • 3aa9501480 Adding main app Will Marshall 2014-06-13 14:13:16 +10:00
  • f7c71568df Merge branch 'laura_and_will' Will Marshall 2014-06-13 12:42:14 +10:00
  • 415a4eff0a Not pre-loading images and setting the map back to gifses Will Marshall 2014-06-13 11:05:32 +10:00
  • bc93ce57e6 Smooth scrolling, svg support via directive Will Marshall 2014-06-13 10:59:49 +10:00
  • 6135fe0336 Revert producers list to standard bullet point list summerscope 2014-06-13 10:26:09 +10:00
  • 4fd1a3d77c Remove SVG from styling - cannot reach it through iframe #document markup summerscope 2014-06-12 16:52:04 +10:00
  • e090352c43 Styling for shopfront page to resize icons as SVGs summerscope 2014-06-12 16:51:32 +10:00
  • e2f983b448 Icon update for update to icon font summerscope 2014-06-12 16:40:06 +10:00
  • 567855b13c Adding in new icon for producers modal list summerscope 2014-06-12 16:39:35 +10:00
  • 2ff4883725 Update icon font to add Bulk icon and pop out icon summerscope 2014-06-12 16:17:59 +10:00
  • f9ded4c616 Markup change for taxon to be spat out correctly in shopfront view summerscope 2014-06-12 16:17:41 +10:00
  • 365c14d4fe Adding smooth scroll to hubses Will Marshall 2014-06-12 16:16:46 +10:00
  • f6690cb8dd Patching a minor bug in cart emptying Will Marshall 2014-06-10 15:21:41 +10:00
  • a55e58d50c Adding working scrolling to anchors Will Marshall 2014-06-12 16:13:39 +10:00
  • 7a062b0310 Reworking the variant display of units and names Will Marshall 2014-06-12 13:05:12 +10:00
  • 8412d740ff Move distributors into sidebar for new & edit shipping methods screen Rob H 2014-06-12 16:10:30 +10:00
  • 1a4e3c20ad Styling for new svg icons for taxons summerscope 2014-06-12 15:47:38 +10:00
  • 98611c3672 Fix timing error in enterprise supplied products rabl spec Rohan Mitchell 2014-06-12 15:21:35 +10:00
  • 9ccdd3b4e0 Add reactive integrity test that soft-deleted variants are removed from order cycles Rohan Mitchell 2014-06-12 14:55:57 +10:00
  • 8cea6d53ed Correctly designate primary_taxon_id as NOT NULL Rohan Mitchell 2014-06-12 12:15:51 +10:00
  • b23430375c Add migration to remove deleted variants from order cycles Rohan Mitchell 2014-06-12 12:15:37 +10:00
  • 0061caa8df Do not show deleted products in order cycle admin Rohan Mitchell 2014-06-03 11:29:07 +10:00
  • 836a08606c Product and variant deletion removes the product or variant from any order cycles Rohan Mitchell 2014-06-12 12:00:16 +10:00
  • 083220089f WIP: Delete ExchangeVariants when product is soft-deleted Rohan Mitchell 2014-06-06 14:52:26 +10:00
  • c21d5cc3dc Remove redirect to certified hostname - this is now performed by nginx. Fixes SSL errors. Rohan Mitchell 2014-06-06 12:26:30 +10:00
  • 88c41df201 BPE uses soft-delete for products Rohan Mitchell 2014-06-12 11:29:03 +10:00
  • b970f54f53 Admin UI soft-deletes variants, not hard delete Rohan Mitchell 2014-06-12 11:20:25 +10:00
  • 9dc02e5eac Add product soft-delete API action Rohan Mitchell 2014-06-12 11:20:07 +10:00
  • e6c7acdff3 Add soft-delete method to variant Rohan Mitchell 2014-06-12 11:16:52 +10:00
  • 4e98ee6e56 Remove sidebar from admin edit shipping methods Rob H 2014-06-12 14:48:36 +10:00
  • 8acbfba873 Change z index of icon so it sits behind fixed menu at top summerscope 2014-06-12 13:03:39 +10:00
  • 901cde73df Adding not-null constraint Will Marshall 2014-06-12 12:34:53 +10:00
  • be6a043aac 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
  • 0b1b260527 Adding dynamic text to display as placeholder Rob H 2014-06-06 15:43:05 +10:00
  • 7782745663 Add fields for variant display name and display as to bpe Rob H 2014-06-06 10:10:41 +10:00
  • fa567ac607 Change variant name to display name Rob H 2014-06-05 13:39:53 +10:00
  • 9f681bd1ef Use display_as as option value for variant when it is present Rob H 2014-06-04 17:23:11 +10:00
  • 721aeea130 OptionValueNamer spec refactor Rob H 2014-06-04 15:39:04 +10:00