Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant into august_spring

* 'august_spring' of bitbucket.org:code2lab/sxrestaurant:
  Timepicker Bug Fix
  Show data in Edit
  Promotion Destory Bug Fix
This commit is contained in:
Zin Lin Phyo
2017-09-06 18:28:09 +06:30
4 changed files with 80 additions and 21 deletions

View File

@@ -1,5 +1,5 @@
class Promotion < ApplicationRecord
validates_presence_of :promo_code,:promo_start_date,:promo_end_date,:promo_start_hour,:promo_end_hour,:promo_day,:promo_type,:original_product,:min_qty
validates_presence_of :promo_code,:promo_start_date,:promo_end_date,:promo_start_hour,:promo_end_hour,:promo_type,:original_product,:min_qty
has_many :promotion_products