Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
a3c144d
update feature test
magnus-thor Feb 12, 2018
e210769
fix wrong total price in feature test
magnus-thor Feb 12, 2018
e1c19d2
update review order email
magnus-thor Feb 12, 2018
417969c
update review order email
magnus-thor Feb 12, 2018
30255cd
create html confirmation email
magnus-thor Feb 12, 2018
231fca7
create html emails for cancellation and move_by_bike
magnus-thor Feb 13, 2018
b2ec756
commented out showing of pictures in test emails
magnus-thor Feb 15, 2018
1d50a31
comment out code for mailing in development.rb
magnus-thor Feb 15, 2018
fe5cbd9
commented out mailer code in test.rb
magnus-thor Feb 15, 2018
d305a85
in test.rb changed to delivery_method test
magnus-thor Feb 15, 2018
232a259
changed review order email
magnus-thor Feb 19, 2018
bfe9dbe
update feature test
magnus-thor Feb 19, 2018
e3ec041
added bootstrap cdn to email layout
magnus-thor Feb 20, 2018
9b8b73d
update review order email
magnus-thor Feb 20, 2018
79394cd
made confirmation email responsive
magnus-thor Feb 20, 2018
71dbba7
WIP styling the html email
magnus-thor Feb 20, 2018
4b06471
Futura font is in confirmation email
magnus-thor Feb 20, 2018
02568f9
added gmail to development to test emails
magnus-thor Feb 21, 2018
007ab38
added premailer gem
magnus-thor Feb 22, 2018
ae787bb
extracted partials from emails
magnus-thor Feb 22, 2018
b33d969
added mjml gem
magnus-thor Feb 28, 2018
90043ce
working on mjml email for review order
magnus-thor Mar 4, 2018
c578591
WIP - styling review order mjml email
magnus-thor Mar 5, 2018
3b4af9c
mjml emails styling sorted, need to clean up unused code and comments
magnus-thor Mar 5, 2018
8d14fb3
WIP - Cleaning up the mjml emails
magnus-thor Mar 5, 2018
acac3f8
remove unnecessary mj-columns and mj-sections
magnus-thor Mar 5, 2018
f0b35f2
WIP - displaying logo in mjml emails and development mode
magnus-thor Mar 7, 2018
f68ae1d
WIP - Editing the emails according to ida wishes
magnus-thor Mar 7, 2018
21feb9e
Merge branch 'develop' of github.com:CraftAcademy/gigafood into new_r…
magnus-thor Apr 16, 2018
66d1805
switch from using logo on a local server to heroku server
magnus-thor Apr 16, 2018
6a22f7b
deleted Gemfile.lock and ran bundle
magnus-thor Apr 16, 2018
5b4a973
commented out mailers test
magnus-thor Apr 16, 2018
9294b01
commented out code to show pictures in tests
magnus-thor Apr 16, 2018
1585a8d
removed html tags from en.yml
magnus-thor Apr 16, 2018
2fe2c59
updated mjml emails to use I18tn
magnus-thor Apr 17, 2018
3eedc9d
added a skip this scenario to scenario requiring mjml to be installed
magnus-thor May 9, 2018
4234064
added a skip this scenario to generates a menu feature background
magnus-thor May 9, 2018
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -60,3 +60,4 @@ build-iPhoneSimulator/

# unless supporting rvm < 1.11.0 or doing something fancy, ignore this:
.rvmrc
latest.dump
3 changes: 3 additions & 0 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,9 @@ gem 'rails-i18n', '~> 5.0.0'
gem 'acts_as_shopping_cart', github: 'dabit/acts_as_shopping_cart', branch: 'rails51'
gem 'responsive_active_admin'
gem 'active_admin_datetimepicker'
gem 'rack-cors'
gem 'premailer-rails'
gem 'mjml-rails'

# Attachments
gem 'paperclip', '~> 5.0.0'
Expand Down
Loading