promotion + merge with master

2017-08-23 10:12:41 +06:30
parent 28dab9d3e0
commit eedf6c39a1
4 changed files with 20 additions and 22 deletions
--- a/app/models/promotion.rb
+++ b/app/models/promotion.rb
@@ -10,8 +10,7 @@ class Promotion < ApplicationRecord
  PROMO_TYPE3 = "Net_price"
  PROMO_TYPE4 = "Percentage"

-  def self.promo_activate
-    saleObj = Sale.first # Test
+  def self.promo_activate(saleObj)
    current_day = Time.now.strftime("%Y-%m-%d")
    current_time = Time.now.strftime('%H:%M:%S')
    day = Date.today.wday