Commit Graph

  • 1d1c27701d Add admin interface for enterprises Rohan Mitchell 2012-10-31 14:25:00 +11:00
  • 5dcba7403b Avoid contaminating test data Rohan Mitchell 2012-10-31 13:54:14 +11:00
  • 926440a978 Fix namespacing of Distributor in reports controller 0.2.8 Rohan Mitchell 2012-10-31 11:13:55 +11:00
  • 9b32579bd6 Group buy report handles nil variant weight gracefully Rohan Mitchell 2012-10-31 10:37:40 +11:00
  • 5ac904005b Merge branch 'order-cycle-reports' Rohan Mitchell 2012-10-31 10:18:11 +11:00
  • 077098e6c1 Refactor libs to use enterprise instead of supplier and distributor Rohan Mitchell 2012-10-29 14:57:03 +11:00
  • 04d8648c6d Remove pickup address and use single address field for supplier and distributor roles within enterprise Rohan Mitchell 2012-10-28 18:03:19 +11:00
  • 4c2debba7e Model specs pass Rohan Mitchell 2012-10-28 18:00:15 +11:00
  • abe3feb996 Integrate functionality from distributor into enterprise Rohan Mitchell 2012-10-28 17:46:45 +11:00
  • c700d9e71b Create enterprise model, integrate functionality from supplier Rohan Mitchell 2012-10-28 13:24:26 +11:00
  • ff24149195 Combine suppliers and distributors into enterprises table Rohan Mitchell 2012-10-28 12:59:50 +11:00
  • 03610c93de Upgrade capybara and selenium-webdriver for compatibility with Firefox 16 Rohan Mitchell 2012-10-28 12:28:55 +11:00
  • c5941d6cb5 Update distributor details when distributor is changed Rohan Mitchell 2012-10-27 18:50:09 +11:00
  • 773adca838 Display distributor details on product page when distributor is selected Rohan Mitchell 2012-10-27 12:49:57 +11:00
  • 13317347bb Display an explanation message on product page when no distributor is selected Rohan Mitchell 2012-10-27 12:19:44 +11:00
  • 7da595afbd Add cms field to top of delivery page of checkout, located at cms path: /delivery Rob H 2012-10-26 19:29:55 +11:00
  • f960cc44ba Fixed calculations when variant weight is nil Rob H 2012-10-26 17:27:08 +11:00
  • a9293709d8 Merge branch 'master', remote-tracking branch 'origin' Rob H 2012-10-26 17:24:17 +11:00
  • a3042118c7 Merge branch 'group-reports' Rohan Mitchell 2012-10-26 17:14:49 +11:00
  • 01569c2550 Change button text on Payments page to 'Process My Order' Rob H 2012-10-26 16:47:42 +11:00
  • ede4649fbf Merge branch 'master', remote-tracking branch 'origin' Rob H 2012-10-26 16:12:11 +11:00
  • 4dd5e12968 Fix reports controller, previous changes to fix change generate_report were incomplete Rob H 2012-10-26 13:49:39 +11:00
  • d74591afe6 Fixes to reports controller and addition of order cycles reports Rob H 2012-10-26 13:44:13 +11:00
  • 09b60908b8 Fix links to admin distributor edit and delete Rohan Mitchell 2012-10-25 12:20:20 +11:00
  • d1b9ce92f6 Move distributors helper out of spree namespace Rohan Mitchell 2012-10-25 10:26:32 +11:00
  • 784969097d Move admin non-Spree controllers out of Spree namespace Rohan Mitchell 2012-10-25 10:03:17 +11:00
  • 15e91f7743 WIP Move non-admin non-Spree controllers out of Spree namespace Rohan Mitchell 2012-10-20 13:02:19 +11:00
  • c46019d68c WIP: Move Supplier, Distributor, DistributorSet and ProductDistribution models out of Spree namespace Rohan Mitchell 2012-10-18 15:46:09 +11:00
  • aa336d9b9f Merge branch 'feedback' 0.2.7 Rohan Mitchell 2012-10-25 10:34:27 +11:00
  • ff029b8903 Add feedback bar to all pages on the front end Rob H 2012-10-24 18:26:21 +11:00
  • a362dd5161 Change reports controller: generate_report to render_report Rob H 2012-10-24 17:01:50 +11:00
  • 51850be83e Update spree_paypal_express to handle blank states from paypal 0.2.6 Rohan Mitchell 2012-10-24 16:19:53 +11:00
  • 41d547ac2d Minor formatting changes to Order Group Spec Rob H 2012-10-24 16:13:23 +11:00
  • 81b33772fe Fixes to syntax and formatting for group-reports Rob H 2012-10-24 15:21:16 +11:00
  • 32db258db0 Use spree_heroku with support for staging env Rohan Mitchell 2012-10-24 13:11:40 +11:00
  • 3b855a866a Merge branch 'grouper-reports' into group-reports Rob H 2012-10-22 11:35:56 +11:00
  • eb7d69fe6b commit routes.rb file to prevent overwriting Rob H 2012-10-22 11:35:48 +11:00
  • 4c0109bccc Merge branch 'master', remote-tracking branch 'origin' Rob H 2012-10-22 11:15:23 +11:00
  • f83a5b0ba8 Merge branch 'master', remote-tracking branch 'origin' Rob H 2012-10-22 10:45:35 +11:00
  • ddb01e4ccb WIP: Create report grouper, write reports for bulk co-ops and payments Rob H 2012-10-21 13:12:48 +11:00
  • 87a89324d9 Update repo in readme, add Rob to creds Rohan Mitchell 2012-10-19 17:02:09 +11:00
  • 4fc7295b97 Use S3 configuration from environment vars instead of s3.yml Rohan Mitchell 2012-10-19 16:40:18 +11:00
  • 5b025a6cba Make group_buy_unit_size accessible Rohan Mitchell 2012-10-18 15:15:54 +11:00
  • 9166829930 Add group buy unit size field Rohan Mitchell 2012-10-18 11:56:21 +11:00
  • 8c7a02ec10 Fix image uploads with CMS Rohan Mitchell 2012-10-18 11:13:40 +11:00
  • f4f250675c Use eaterprises spree_paypal_express with Bugsnag notification of paypal gateway errors 0.2.5 Rohan Mitchell 2012-10-18 10:30:35 +11:00
  • 394a269df2 Update Spree, fixes paypal password blanking bug. Update spree_paypal_express, fixes nil state error on checkout. Rohan Mitchell 2012-10-18 10:17:52 +11:00
  • 41dcc85ad1 Update version of spree_paypal_express for debugging Rohan Mitchell 2012-10-17 15:26:06 +11:00
  • 9be9d75cb5 Update version of spree_paypal_express for debugging Rohan Mitchell 2012-10-17 15:10:04 +11:00
  • 11483a77e8 Update bugsnag and spree_paypal_express for paypal error debugging 0.2.4 Rohan Mitchell 2012-10-17 08:42:33 +11:00
  • ba895ed486 Display CMS content for suppliers page Rohan Mitchell 2012-10-17 07:54:12 +11:00
  • 36d342f216 Add view all suppliers page Rohan Mitchell 2012-10-17 07:50:58 +11:00
  • d09123eb22 Do not show suppliers with no products in stock Rohan Mitchell 2012-10-17 07:36:18 +11:00
  • 642f58551c Use spree_paypal_express from RohanM with debugging for nil state from paypal address error 0.2.3 Rohan Mitchell 2012-10-16 10:34:11 +11:00
  • 9fbcd8c01b Display CMS pages with Spree's layout 0.2.2 Rohan Mitchell 2012-10-12 10:21:21 +11:00
  • 927970d1a9 Viewing another products listing page does not display home page content 0.2.1 Rohan Mitchell 2012-10-12 09:39:49 +11:00
  • 3dd3d8030f Display CMS pages in menu Rohan Mitchell 2012-10-11 17:00:34 +11:00
  • cab61ddb7c CMS content on home page Rohan Mitchell 2012-10-11 16:21:33 +11:00
  • 015b7f88b0 Add tests for CMS admin security Rohan Mitchell 2012-10-11 13:17:05 +11:00
  • 28fc16ac66 Create links between Spree and CMS admin sections Rohan Mitchell 2012-10-11 12:50:59 +11:00
  • e1d4ee318c Fix issues with elRTE - sprites and functionality now work for link and image functions Rohan Mitchell 2012-10-11 12:00:30 +11:00
  • 48497266da Precompile CMS assets Rohan Mitchell 2012-10-11 11:06:52 +11:00
  • fe5fd76415 Further syntax fixes for GroupBuyReport Rohan Mitchell 2012-10-11 10:53:33 +11:00
  • c05911fa10 Fix spree_creditcards table renamed in Spree 1.2 upgrade, remove old pending test Rohan Mitchell 2012-10-11 10:47:58 +11:00
  • a686a820d9 Add distributor show page, redirect here after selecting distributor Rohan Mitchell 2012-10-11 10:11:09 +11:00
  • 3889545f2b Convert suppliers page to HAML Rohan Mitchell 2012-10-11 10:09:43 +11:00
  • 7432cb416e Andand all the html_safes Rohan Mitchell 2012-10-10 16:58:33 +11:00
  • 0b830a7845 Suppliers and distributors long description editable with WYSIWYG editor from CMS and displayed as HTML Rohan Mitchell 2012-10-10 14:59:57 +11:00
  • 58e5724f81 Display supplier details on supplier page Rohan Mitchell 2012-10-10 12:08:35 +11:00
  • c07a33d88c Edit long description field in admin for suppliers and distributors Rohan Mitchell 2012-10-10 11:57:49 +11:00
  • d080aa49d5 Add long description field to distributors and suppliers Rohan Mitchell 2012-10-10 11:50:04 +11:00
  • a31c5bbe46 Authorise CMS via Spree login Rohan Mitchell 2012-10-10 11:40:12 +11:00
  • b35fb618f3 Add base install of Comfortable Mexican Sofa Rohan Mitchell 2012-10-10 10:32:21 +11:00
  • 8c7ed6f4ef Merge branch 'group-buy-report' Rob H 2012-10-10 15:47:02 +11:00
  • 1709083d8f Merge branch 'master' of github.com:andrewspinks/openfoodweb Rob H 2012-10-10 15:45:42 +11:00
  • 5803da9c55 Syntax fixes for group buy report classes and tests Rob H 2012-10-10 15:13:15 +11:00
  • 0ad6045363 Fix struct superclass mismatch error Rohan Mitchell 2012-10-10 14:02:44 +11:00
  • 9737f21bb8 WIP: Write body of group buy report Rob H 2012-10-10 13:46:51 +11:00
  • 2535e3965b When merging orders, set distributor when target order distributor is nil 0.2.0 Rohan Mitchell 2012-10-09 08:42:29 +11:00
  • 568d948cbe Destroy incomplete orders if they can't be merged, prevents that order unexpectedly appearing in cart after checkout. Also ensure all orders have a shipping method. Rohan Mitchell 2012-10-05 12:09:53 +10:00
  • d7a5a87aef create group buy report, display header Rob H 2012-10-03 11:49:21 +10:00
  • 3b8c41840f Merge branch 'master' of github.com:andrewspinks/openfoodweb Rob H 2012-10-03 10:27:19 +10:00
  • 6d9257d941 Do not delete shipping method referenced by a line item Rohan Mitchell 2012-10-02 12:15:09 +10:00
  • 7430fc9bdd Do not delete shipping method referenced by a product distribution Rohan Mitchell 2012-10-02 11:58:18 +10:00
  • 473b4e9adc Add positive case test Rohan Mitchell 2012-10-02 11:54:18 +10:00
  • 2aa450b072 Do not delete shipping method referenced by an order Rohan Mitchell 2012-10-02 11:51:13 +10:00
  • 3886ec39f7 Add web helper method to visit paths with delete method Rohan Mitchell 2012-10-02 11:47:55 +10:00
  • afb8faa96f Update zeus config Rohan Mitchell 2012-10-02 11:44:50 +10:00
  • 27b7d59f46 BaseController does not attempt to merge incomplete and current orders when they have differing distributors Rohan Mitchell 2012-10-02 09:44:51 +10:00
  • bc408d8b6e Add jquery and jquery_ujs includes to admin/all.js, as these have been removed from spree/admin/spree_core.js Rohan Mitchell 2012-09-22 09:20:27 +10:00
  • a8758f1271 Fix OrdersHelper for upgraded spree Rohan Mitchell 2012-09-21 16:36:50 +10:00
  • 2bce9df25a Track 1-1-stable on spree git, fixes order quantity change bug Rohan Mitchell 2012-09-21 15:55:51 +10:00
  • 479c49752c Update spree_paypal_express, hopefully fixing 'Validation failed: State can't be blank' error Rohan Mitchell 2012-09-21 15:32:19 +10:00
  • 62d6067c1a Do not truncate cents for product price update on add to cart JS Rohan Mitchell 2012-09-21 12:44:38 +10:00
  • a1b5102476 Fix checkout totals, also amend factories for valid test shipping method data Rohan Mitchell 2012-09-21 12:35:01 +10:00
  • 593f3887c8 Switch pry for pry-debugger Rohan Mitchell 2012-09-21 12:29:06 +10:00
  • 757456dd57 Set line item shipping method in callback so that Order#update shipping calcs run correctly Rohan Mitchell 2012-09-20 10:45:50 +10:00
  • 3894ce946d Fix error on supplier page, add test to cover Rohan Mitchell 2012-09-19 15:46:56 +10:00
  • f1f9b5b2e8 Make order and distributor report resilient to orders without distributors Rohan Mitchell 2012-09-19 15:19:30 +10:00
  • 5402590d5f Add debug output on line item migration for lost data Rohan Mitchell 2012-09-19 15:08:05 +10:00