caboose-cms 0.5.62 → 0.5.63

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,15 +1,15 @@
1
1
  ---
2
2
  !binary "U0hBMQ==":
3
3
  metadata.gz: !binary |-
4
- ZWY5NWZiNDVhODg1NDk4MGQ2MjgwYjg3NTAyNWJhNDg4ZGE5MTliOQ==
4
+ YjVmNWIwOTkxMzZlNWFmMTkxMGEyYjQ5N2JkNTQyZTZkYjRhMGJmOQ==
5
5
  data.tar.gz: !binary |-
6
- OTIxNWYxNDAzZTZlYWNkZjIyNWU0NTQwZmU0ODdiYjA0Y2Y2ODA2Nw==
6
+ OTQ0M2Q5MjgzODk4ZTE4Y2FjOTc3MjA5MmUzNjNmMGIyYmNmNmYwMg==
7
7
  SHA512:
8
8
  metadata.gz: !binary |-
9
- MTgxMTdiMDc3YjEwYTg5ZTQxMWQ4YmQ2ZGMzMDZlZjkwN2JiNTlkNzNmZDk1
10
- ZGRhZTc1YzIyZDU3YTMxNTg4NzE2ZmVkZmZjMzVlMjQ5YmRkMDllMjRjMDA1
11
- N2E1ZDZmNmM0MzQ1YjMxZGNlYjJiODU5N2M1NGI5YWJlMGE2ZTQ=
9
+ ZWNkODdlNzcxMjY5NjUxZGYyNTUzZTJjMGYzMjc1MDU3ZjgxOGMxZGFkZGM3
10
+ YTdiODJhNWVmZTg1YTk5MTFiMDg4N2MwNDRiYjI3YmJmOWI2NTg2OTc1MWI4
11
+ YTRhNjdkOGQ1N2UxNjg1MGJhMmExOTBhN2JlZDc2ZWM5NTM0Mzc=
12
12
  data.tar.gz: !binary |-
13
- OTcxNjE0MjEzYzVhNWQwOThjN2VmZjQzZjY1YmE3MTFkNDM5ODFmM2E4MmE0
14
- MGUwMzM5OGY5NjQyNjE1MDA3MmI4NDc5OTU1NWI4NzIzMWExYjczMjIwZDI5
15
- NDAzZDA5ZDFmOGFhNDVhYzQ5OTQ3ZWYwODMzZGRhNTFkMmU5YTM=
13
+ ZTdkNzZmYmFiYzg3MjhhZThmNGI3Mjk0MGJkNGRiMGNlMzY5NDdmOTExN2I5
14
+ MjA0NmRmNWNmYjNiMzVhZmE2ZGYwNWY2OTE3MTM5NWU1YWJlOTI1YTc2Mzlh
15
+ MTA3ZWIwZTlmMWY2MDdiYzUyNmUyM2JmN2Q3MGU4MDQ5MDcyOTI=
@@ -20,8 +20,8 @@
20
20
 
21
21
  .mb_container input.mb_dirty,
22
22
  .mb_container textarea.mb_dirty {
23
- background: #fff799;
24
- color: #000;
23
+ background: #fff799 !important;
24
+ color: #000 !important;
25
25
  }
26
26
 
27
27
  .mb_container select.mb_fake {
@@ -1,29 +1,44 @@
1
1
  module Caboose
2
2
  class OrdersMailer < ActionMailer::Base
3
- default :from => Caboose::from_address.nil? ? 'caboose-store.actionmailer@gmail.com' : Caboose::from_address
4
3
 
4
+ #before_action :configure
5
+ #def configure(site_id)
6
+ # settings = Caboose::SmtpConfig.where(:site_id => site_id).first
7
+ # delivery_options = {
8
+ # :user_name => settings.user_name,
9
+ # :password => settings.password,
10
+ # :address => settings.address,
11
+ # :port => settings.port,
12
+ # :domain => settings.domain,
13
+ # :authentication => settings.authentication,
14
+ # :enable_starttls_auto => settings.enable_starttls_auto
15
+ # }
16
+ # default_options[:from] = delivery_options[:user_name]
17
+ # delivery_method.settings.merge!(delivery_options)
18
+ #end
19
+
5
20
  # Sends a confirmation email to the customer about a new order
6
- def customer_new_order(order)
21
+ def customer_new_order(order)
7
22
  @order = order
8
23
  mail(:to => order.customer.email, :subject => 'Thank you for your order!')
9
24
  end
10
25
 
11
26
  # Sends a notification email to the fulfillment dept about a new order
12
- def fulfillment_new_order(order)
27
+ def fulfillment_new_order(order)
13
28
  @order = order
14
29
  sc = order.site.store_config
15
30
  mail(:to => sc.fulfillment_email, :subject => 'New Order')
16
31
  end
17
32
 
18
33
  # Sends a notification email to the shipping dept that an order is ready to be shipped
19
- def shipping_order_ready(order)
34
+ def shipping_order_ready(order)
20
35
  @order = order
21
36
  sc = order.site.store_config
22
37
  mail(:to => sc.shipping_email, :subject => 'Order ready for shipping')
23
38
  end
24
39
 
25
40
  # Sends a notification email to the customer that the status of the order has been changed
26
- def customer_status_updated(order)
41
+ def customer_status_updated(order)
27
42
  @order = order
28
43
  mail(:to => order.customer.email, :subject => 'Order status update')
29
44
  end
@@ -1,3 +1,3 @@
1
1
  module Caboose
2
- VERSION = '0.5.62'
2
+ VERSION = '0.5.63'
3
3
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: caboose-cms
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.5.62
4
+ version: 0.5.63
5
5
  platform: ruby
6
6
  authors:
7
7
  - William Barry
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2014-12-12 00:00:00.000000000 Z
11
+ date: 2014-12-15 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: pg
@@ -466,8 +466,6 @@ files:
466
466
  - app/assets/templates/caboose/product/images.jst.ejs
467
467
  - app/assets/templates/caboose/product/images_old.jst.ejs
468
468
  - app/assets/templates/caboose/product/options.jst.ejs
469
- - app/controllers/caboose/#Untitled-1#
470
- - app/controllers/caboose/#Untitled-2#
471
469
  - app/controllers/caboose/ab_options_controller.rb
472
470
  - app/controllers/caboose/ab_variants_controller.rb
473
471
  - app/controllers/caboose/admin_controller.rb
@@ -1,7 +0,0 @@
1
- Repconnex
2
- api_login_id: 3a79FjaHV
3
- api_transaction_key: 3K4v7n423KvA5R9P
4
-
5
- Locker Room
6
- 47G9Y5vvQt
7
- 4U6zLSj9u5V4Cq8B
@@ -1,3 +0,0 @@
1
-
2
- Authorize.net case number: 1-114331243
3
-