Started development for the new checkout process. TRAD-20 #time 4h Started dev foundations
Working on the new checkout form layout. TRAD-20 #time 1h View dev work
Contunued work on the new checkout page. TRAD-20
Fixed the estimate functionality so it now works with the new checkout form. TRAD-20 #time 30m Fixing estimate delivery functionality
Finished the basic template styling for the checkout process. Now for the payment business logic refactoring. TRAD-20 #time 1h 30m Finished checkout syling
Started to integrate payment methods and PayPal back into the checkout. Minor UI changes also to ensure a clean user experience. TRAD-20 #time 3h Integrating payment methods.
Continued development on adjuting on the user experience for the checkout. TRAD-20 #time 1h User experience adjustments
Started building new confirm order view. TRAD-20 #time 25m Building confirm order view
Building the confirm order view. TRAD-20 #time 1h 30m Building views
Fixed bug whereby cart and order models had to share the same model. TRAD-20 #time 30m Fixed bug
Further mods to the paypal checkout process. TRAD-20 #time 45m Working on a working checkout process with paypal
Adding includes for the order address data. TRAD-20
Modified the checkout action to render the order data if there is one associated with the cart. Rendered the delivery & billing address data and added an 'edit order' button to the confirm view. Modified several pieces of business logic to cater for these updates. TRAD-20 #time 4h Improving checkout user experience
Added ruby version file.
Merge branch 'master' into cart

Conflicts:
	Gemfile
	app/assets/javascripts/themes/redlight/application.js.erb
	app/controllers/delivery_service_prices_controller.rb
	app/views/themes/redlight/carts/_cart.html.haml
	app/views/themes/redlight/orders/_cart.html.haml
	config/environments/production.rb
	db/schema.rb
	spec/controllers/delivery_service_prices_controller_spec.rb
Cleaning up views and controllers to abhere to new functionality merged in from the master branch. TRAD-20 #time 1h Dev work
Updated various parts of the current order process with new syntax introduced by the master branch. TRAD-20 #time 20m Dev work
Removed rbenv .ruby-version from git tracking and added reference to gitignore config.
Optimised the order process by reducing db queries; cleaned up the sku table partial; setup bespoke method for handling fatal order error codes and modified the delivery service price logic to select the cheapest available price per delivery service. TRAD-20 #time Optimising and fixing bugs
Displayed payment details on confirmation view; generally cleaned up the order process; tested the order process with a successful and failed outcome; cleaned up views to adhere to new functionality introduced by the master branch. TRAD-20 #time 3h Testing and cleaning order process.