diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss
index b7bcb027..9caef6fe 100755
--- a/app/assets/stylesheets/application.scss
+++ b/app/assets/stylesheets/application.scss
@@ -63,4 +63,33 @@ select:focus {
border-top: .375em solid #111;
pointer-events: none;
}
-}
\ No newline at end of file
+}
+
+/*Pagination*/
+nav.pagination {
+ margin:10px;
+
+}
+nav.pagination .current{
+ background-color:#1f91f3;
+ color:#fff;
+ padding:4px 10px;
+ margin-top:-4px;
+}
+nav.pagination .page a,.next a,.last a,.prev a,.first a{
+ padding:6.5px 10px;
+ margin-left: 3px;
+}
+
+nav.pagination .page a:hover,
+a:focus {
+ background-color: #ccc;
+ text-decoration: none;
+
+}
+nav.pagination .page a:hover,
+.first a:hover,.last a:hover,.prev a:hover,.next a:hover{
+ background-color: #ccc;
+ text-decoration: none;
+
+}
diff --git a/app/controllers/crm/customers_controller.rb b/app/controllers/crm/customers_controller.rb
index a95194fe..d8ee10fb 100755
--- a/app/controllers/crm/customers_controller.rb
+++ b/app/controllers/crm/customers_controller.rb
@@ -241,9 +241,10 @@ end
url = membership.gateway_url.to_s + memberaction.gateway_url.to_s
member_params = { name: name,phone: phone,email: email,
- dob: dob,address: address,nrc:nrc,card_no:card_no,
- member_group_id: member_group_id,
- merchant_uid:merchant_uid,auth_token:auth_token}.to_json
+ dob: dob,address: address,nrc:nrc,card_no:card_no,
+ member_group_id: member_group_id,
+ id:id,
+ merchant_uid:merchant_uid,auth_token:auth_token}.to_json
# Check for paypar account exists
# if paypar_account_no != nil || paypar_account_no != ''
@@ -252,6 +253,7 @@ end
dob: dob,address: address,nrc:nrc,card_no:card_no,
paypar_account_no: paypar_account_no,
member_group_id: member_group_id,
+ id:id,
merchant_uid:merchant_uid,auth_token:auth_token}.to_json
end
@@ -273,7 +275,8 @@ end
rescue SocketError
response = { status: false}
end
-
+ puts "ssssssss"
+ puts response.to_json
customer = Customer.find(@crm_customer.customer_id)
if response["status"] == true
@@ -299,9 +302,10 @@ end
url = membership.gateway_url.to_s + memberaction.gateway_url.to_s
member_params = { name: name,phone: phone,email: email,
- dob: dob,address: address,nrc:nrc,card_no:card_no,
- member_group_id: member_group_id,
- merchant_uid:merchant_uid,auth_token:auth_token}.to_json
+ dob: dob,address: address,nrc:nrc,card_no:card_no,
+ member_group_id: member_group_id,
+ id:id,
+ merchant_uid:merchant_uid,auth_token:auth_token}.to_json
# Check for paypar account exists
if paypar_account_no.present?
@@ -309,6 +313,7 @@ end
dob: dob,address: address,nrc:nrc,card_no:card_no,
paypar_account_no: paypar_account_no,
member_group_id: member_group_id,
+ id:id,
merchant_uid:merchant_uid,auth_token:auth_token}.to_json
end
@@ -331,7 +336,17 @@ end
response = { status: false}
end
+ puts "ssssssss"
+ puts response.to_json
+
if response["status"] == true
+ customer = Customer.find(@crm_customer.customer_id)
+ # Check membership id and bind to user
+ if response["membership_id"] != nil
+ status = customer.update_attributes(membership_id: response["membership_id"],membership_type:member_group_id )
+ else
+ status = customer.update_attributes(membership_type:member_group_id )
+ end
format.html { redirect_to crm_customers_path, notice: 'Customer was successfully updated.' }
format.json { render :show, status: :ok, location: @crm_customer }
else
diff --git a/app/models/ability.rb b/app/models/ability.rb
index 1636d048..70ce4e94 100755
--- a/app/models/ability.rb
+++ b/app/models/ability.rb
@@ -32,6 +32,7 @@ class Ability
can :manage, Order
+ can :manage, Booking
can :manage, Sale
@@ -84,7 +85,7 @@ class Ability
can :read, Order
can :update, Order
-
+ can :menage, Booking
can :read, Sale
can :update, Sale
can :get_customer, Customer
diff --git a/app/models/customer.rb b/app/models/customer.rb
index 82761ba7..13e6c277 100755
--- a/app/models/customer.rb
+++ b/app/models/customer.rb
@@ -95,7 +95,7 @@ class Customer < ApplicationRecord
auth_token = memberaction.auth_token.to_s
url = membership.gateway_url.to_s + memberaction.gateway_url.to_s
- @customers = Customer.where("membership_type IS NOT NULL AND membership_id IS NULL")
+ @customers = Customer.where("membership_type IS NOT NULL AND membership_id IS NULL")
@customers.each do |customer|
member_params = { name: customer.name,phone: customer.contact_no,
@@ -106,7 +106,7 @@ class Customer < ApplicationRecord
# Check for paypar account exists
# if paypar_account_no != nil || paypar_account_no != ''
- if paypar_account_no.present?
+ if customer.paypar_account_no.present?
member_params = { name: customer.name,phone: customer.contact_no,
email: customer.email,dob: customer.date_of_birth,
address: customer.address,nrc:customer.nrc_no,
@@ -131,7 +131,6 @@ class Customer < ApplicationRecord
rescue SocketError
response = { status: false, message: "Can't connect server"}
end
-
if response["status"] == true
status = customer.update_attributes(membership_id: response["customer_datas"]["id"])
end
@@ -165,10 +164,12 @@ class Customer < ApplicationRecord
credit = 1
end
end
+
# overall_dis = SaleItem.get_overall_discount(sObj.id)
overall_dis = sObj.total_discount
total_amount = rebate_prices - payparcost - overall_dis
+
if credit == 1
total_amount = 0
end
diff --git a/app/views/layouts/_left_sidebar.html.erb b/app/views/layouts/_left_sidebar.html.erb
index fb326c24..25b196af 100755
--- a/app/views/layouts/_left_sidebar.html.erb
+++ b/app/views/layouts/_left_sidebar.html.erb
@@ -77,6 +77,11 @@
<%= t :transactions %>