merge with master

2018-01-09 16:40:45 +06:30
parent 13ec405437 afd893d831
commit 2b50ae5fb9
91 changed files with 2666 additions and 744 deletions
--- a/app/controllers/crm/customers_controller.rb
+++ b/app/controllers/crm/customers_controller.rb
@@ -37,6 +37,8 @@ class Crm::CustomersController < BaseCrmController
    @crm_customer   = Customer.new
    @count_customer = Customer.count_customer

+    @membership_types = Lookup.collection_of("member_group_type")
+
    @taxes = TaxProfile.all.order("order_by asc")

    @filter = filter