From f0d3f30d884df5c0d29ec1119536d5fa4d986f89 Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Thu, 15 Jun 2017 16:24:00 +0630 Subject: [PATCH 1/5] update order queue , sale void --- .../order_queue_stations_controller.rb | 3 +- .../transactions/sales_controller.rb | 34 ++++++++++-------- app/models/sale_audit.rb | 2 +- .../order_queue_stations/index.html.erb | 2 +- app/views/transactions/sales/index.html.erb | 35 +++++++++++-------- app/views/transactions/sales/show.html.erb | 4 +-- app/views/transactions/sales/void.html.erb | 8 ++--- config/routes.rb | 2 +- 8 files changed, 50 insertions(+), 40 deletions(-) diff --git a/app/controllers/settings/order_queue_stations_controller.rb b/app/controllers/settings/order_queue_stations_controller.rb index 46fcb54d..e8b9bbe0 100644 --- a/app/controllers/settings/order_queue_stations_controller.rb +++ b/app/controllers/settings/order_queue_stations_controller.rb @@ -4,7 +4,8 @@ class Settings::OrderQueueStationsController < ApplicationController # GET /settings/order_queue_stations # GET /settings/order_queue_stations.json def index - @settings_order_queue_stations = OrderQueueStation.all.active + @settings_order_queue_stations = OrderQueueStation.all + @settings_order_queue_stations = Kaminari.paginate_array(@settings_order_queue_stations).page(params[:page]).per(50) end # GET /settings/order_queue_stations/1 diff --git a/app/controllers/transactions/sales_controller.rb b/app/controllers/transactions/sales_controller.rb index 82be6f59..c4666c5e 100644 --- a/app/controllers/transactions/sales_controller.rb +++ b/app/controllers/transactions/sales_controller.rb @@ -9,23 +9,30 @@ class Transactions::SalesController < ApplicationController receipt_no = params[:receipt_no] today = Date.today - if receipt_no.nil? - sales = Sale.order("sale_id desc") + if receipt_no.nil? && search_date.nil? + @sales = Sale.where("NOT sale_status = 'void' " ).order("sale_id desc").limit(500) + @sales = Kaminari.paginate_array(@sales).page(params[:page]).per(50) else - order = Sale.search(receipt_no) - if order.count > 0 - sales = order + if !search_date.blank? && receipt_no.blank? + sale = Sale.where("DATE_FORMAT(receipt_date,'%d-%m-%Y') = ? and NOT sale_status = 'void' ", search_date).order("sale_id desc").limit(500).page(params[:page]) + elsif !search_date.blank? && !receipt_no.blank? + sale = Sale.where("receipt_no LIKE ? or DATE_FORMAT(receipt_date,'%d-%m-%Y') = ? and NOT sale_status = 'void' ", "%#{receipt_no}%", search_date).order("sale_id desc").limit(500).page(params[:page]) + else + sale = Sale.where("receipt_no LIKE ? and NOT sale_status = 'void' ", receipt_no).order("sale_id desc").limit(500).page(params[:page]) + end + if sale.count > 0 + @sales = sale + @sales = Kaminari.paginate_array(@sales).page(params[:page]).per(50) else - sales = Sale.order("sale_id desc") - - end - end - @sales = Kaminari.paginate_array(sales).page(params[:page]).per(50) + @sales = 0 + end + end respond_to do |format| format.html # index.html.erb format.json { render json: @sales } end + end # GET /transactions/sales/1 @@ -108,11 +115,10 @@ class Transactions::SalesController < ApplicationController sale_id = params[:sale_id] reason = params[:reason] sale = Sale.find(sale_id) - sale.sales_status = 'void' - sale.remarks = reason - sale.void_by = current_user.id + sale.sale_status = 'void' + sale.requested_by = current_login_employee.id if sale.save - sale =SaleAudit.record_audit_void(sale_id, current_user.id, current_user.id, reason) + @sale = SaleAudit.record_audit_void(sale_id, current_login_employee.id, current_login_employee.id, reason) end respond_to do |format| format.html { redirect_to transactions_sales_url, notice: 'Sale was successfully void.' } diff --git a/app/models/sale_audit.rb b/app/models/sale_audit.rb index 29daa796..d369b8e1 100644 --- a/app/models/sale_audit.rb +++ b/app/models/sale_audit.rb @@ -6,7 +6,7 @@ class SaleAudit < ApplicationRecord belongs_to :sale - def record_audit_void(sale_id, void_by, approved_by, reason) + def self.record_audit_void(sale_id, void_by, approved_by, reason) #sale_audit sale_audit = SaleAudit.new() sale_audit.sale_id = sale_id diff --git a/app/views/settings/order_queue_stations/index.html.erb b/app/views/settings/order_queue_stations/index.html.erb index c87ba5f7..03da3c23 100644 --- a/app/views/settings/order_queue_stations/index.html.erb +++ b/app/views/settings/order_queue_stations/index.html.erb @@ -42,5 +42,5 @@ <% end %> - + <%= paginate @settings_order_queue_stations %> diff --git a/app/views/transactions/sales/index.html.erb b/app/views/transactions/sales/index.html.erb index ee82eb8b..b7e73219 100644 --- a/app/views/transactions/sales/index.html.erb +++ b/app/views/transactions/sales/index.html.erb @@ -20,9 +20,9 @@ <%= form_tag transactions_sales_path, :method => :get do %>
- + - +
<% end %> @@ -41,23 +41,28 @@ - <% @sales.each do |sale| %> - - - <%= sale.sale_id %> - <%= sale.receipt_no %> - <%= sale.grand_total rescue '-' %> - <%= sale.total_tax %> - <%= sale.cashier_name rescue '-' %> - <%= sale.sale_status %> - <%= sale.receipt_date.strftime("%d-%m-%Y") %> - <%= link_to 'Show', transactions_sale_path(sale) %> - + <% if @sales != 0 %> + <% @sales.each do |sale| %> + + <%= sale.sale_id %> + <%= sale.receipt_no %> + <%= sale.grand_total rescue '-' %> + <%= sale.total_tax %> + <%= sale.cashier_name rescue '-' %> + <%= sale.sale_status %> + <%= sale.receipt_date.strftime("%d-%m-%Y") %> + <%= link_to 'Show', transactions_sale_path(sale) %> + + <% end %> + <% else %> +

There is no data for search....

 <% end %>
- <%= paginate @sales %> + <% if @sales != 0 %> + <%= paginate @sales %> + <% end %> diff --git a/app/views/transactions/sales/show.html.erb b/app/views/transactions/sales/show.html.erb index 05514c7b..6fc4dd03 100644 --- a/app/views/transactions/sales/show.html.erb +++ b/app/views/transactions/sales/show.html.erb @@ -171,11 +171,11 @@ - diff --git a/app/views/transactions/sales/void.html.erb b/app/views/transactions/sales/void.html.erb index aef0aa40..9d18cca1 100644 --- a/app/views/transactions/sales/void.html.erb +++ b/app/views/transactions/sales/void.html.erb @@ -61,18 +61,16 @@ var reason = $('input[type="radio"]:checked').val(); console.log(reason) - var url = '<% transactions_manual_void_sale_path()%>'; + var url = 'manual_void_sale';alert(url) var sale_id = $(this).find(".customer-id").text(); $.ajax({ type: 'POST', - url: 'sales/manual_void_sale', + url: 'manual_void_sale', data: {reason: reason, sale_id: sale_id}, success: function(data){ - window.location.href = "transactions/sales" + // window.location.href = "transactions/sales" } }); - - }); }); diff --git a/config/routes.rb b/config/routes.rb index 299c1b87..f1ad9961 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -199,7 +199,7 @@ Rails.application.routes.draw do resources :sales resources :orders get "/sales/:sale_id/void" =>"sales#void", :as => "void" - post "sales/manual_void_sale", to: "sales#manual_void_sale", :as => "manual_void_sale" + post "sales/:sale_id/manual_void_sale", to: "sales#manual_void_sale", :as => "manual_void_sale" end #--------- Reports Controller Sections ------------# From 77049176f6f100d27c98207b9e2abe81a9268919 Mon Sep 17 00:00:00 2001 From: Yan Date: Thu, 15 Jun 2017 16:47:04 +0630 Subject: [PATCH 2/5] oqs and zone for seed --- app/assets/javascripts/OQS.js | 6 +++--- db/seeds.rb | 8 ++++---- dump.rdb | Bin 18312 -> 18306 bytes lib/tasks/menu_import.rake | 10 ++++++++++ 4 files changed, 17 insertions(+), 7 deletions(-) diff --git a/app/assets/javascripts/OQS.js b/app/assets/javascripts/OQS.js index 3674e235..9ad540ab 100644 --- a/app/assets/javascripts/OQS.js +++ b/app/assets/javascripts/OQS.js @@ -18,9 +18,9 @@ $(document).ready(function(){ // auto refresh every 10 seconds - setTimeout(function(){ - window.location.reload(1); - }, 10000); + // setTimeout(function(){ + // window.location.reload(1); + // }, 10000); $('.queue_station').on('click',function(){ var orderZone=$(this).children().children().children('.order-zone').text(); diff --git a/db/seeds.rb b/db/seeds.rb index cfbcd914..f6323d48 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -132,13 +132,13 @@ menu_item_attribute_size_large = MenuItemAttribute.create({attribute_type:"size" #Default Order Queue stations -order_queue_station1 = OrderQueueStation.create({station_name: "Queue Station 1", is_active: true,printer_name: "kitchen_printer", processing_items: JSON.generate(['01001','01002','01003','01004']), print_copy:true, cut_per_item: false, use_alternate_name: false, created_by: "SYSTEM DEFAULT"}) -order_queue_station2 = OrderQueueStation.create({station_name: "Queue Station 2", is_active: true,printer_name: "drink_printer", processing_items: JSON.generate(['02005','02006','02007','02008']), print_copy:true, cut_per_item: true, use_alternate_name: true, created_by: "SYSTEM DEFAULT"}) -zone_order_queue_station = OrderQueueStation.create({station_name: "Zone 1 Queue Station 2", is_active: true, printer_name: "print_station", processing_items: JSON.generate(['01001','01002','01003','01004','02005','02006','02007','02008']), print_copy: true, cut_per_item: true, use_alternate_name: false, created_by: "SYSTEM DEFAULT"}) +# order_queue_station1 = OrderQueueStation.create({station_name: "Queue Station 1", is_active: true,printer_name: "kitchen_printer", processing_items: JSON.generate(['01001','01002','01003','01004']), print_copy:true, cut_per_item: false, use_alternate_name: false, created_by: "SYSTEM DEFAULT"}) +# order_queue_station2 = OrderQueueStation.create({station_name: "Queue Station 2", is_active: true,printer_name: "drink_printer", processing_items: JSON.generate(['02005','02006','02007','02008']), print_copy:true, cut_per_item: true, use_alternate_name: true, created_by: "SYSTEM DEFAULT"}) +# zone_order_queue_station = OrderQueueStation.create({station_name: "Zone 1 Queue Station 2", is_active: true, printer_name: "print_station", processing_items: JSON.generate(['01001','01002','01003','01004','02005','02006','02007','02008']), print_copy: true, cut_per_item: true, use_alternate_name: false, created_by: "SYSTEM DEFAULT"}) #Default Order Queue Process By Zone -#zone_queue_station = OrderQueueProcessByZone.create({order_queue_station: zone_order_queue_station, zone: zone2}) +# zone_queue_station = OrderQueueProcessByZone.create({order_queue_station: zone_order_queue_station, zone: zone2}) #Create Adminstrator employee diff --git a/dump.rdb b/dump.rdb index 3c28111097919f72ba1d6b6fa14b1cee5fe18c8f..7ef364dfb335d9809431ee24ceb43df40ac926f4 100644 GIT binary patch delta 1028 zcmZ`&OGs2v7`|ujj83WJj2NaB-hviU-p=DcFGF#rLRuJ_MF^!%X(ad{)J2OZGQtQl zIc)=>7D1cfCRCf4EX2x9%U(n34MY7ykM7MUoZrr`1TyK?n(3bIu;0~udph%NBPATPkFg;3;gpSzrN4Dgs(^21?kU!h&fMw3qxq=#9y4m<;CE4kGtms?#K@C(Pxhr?Hsi z%P<@yG5c$Ko1L3sf{9kE10hMhMg&D5p}DUll|b}d@>QzCZa!}oqYH_s

A3eel{5 z7GAx%Q@YzcXxzZUiV93-J}>K-n<=OWB9wuk#oba!A1LEgnp4{@1$SZ(LzU&0u;iTh z8ZhWy(^0#p(>vMQni&r5A8G4ta`v{Y^ESCTYqRJ=){4QLUPXJjG1HV=%!7m9kH9AWN9jvB;jwiaT*Su`6FoMCk)@i&DWbvrIN zC{r&d&C<4om{(I~y&^tQ3;@h@MOubI6QyRpF8lGsVSjVQS!cFH0~M@b2?$KJPi!p+ zNJGje&6n-ZD=4Ot_?$_CLF9U3wl~Cf6lmq!0SfCCV>!;vgCf@Kx#YXl!JNoour2m_WvucY@6PT=iynPvq)K~wHyJ8sJuWa@)8=xtEB zs}03-rIVB~UlJi1$#wgfRrF7_y=%!(vD%DKt&0|LO^KiT#YNE5@WBm|Y_ZgRnQz{N zIlX>9QIY2^?34hYP~=|A(G3^u4gH6FG=!lLopnb0(k`+nKb!YOLwzB8(RHS~bxX8A L6Lfz{pKbXAi5x9* delta 1063 zcmZ`&U1*JA9Dkp4wzE%j%*t%&oDuTz?)mSC?TRW8_SiF$w!nt?`wx$aQXgwpa1Xk-*Xo9p9SY&b?Ihj@Au-a zj!e_qmQ2g=v2XLOpVp6gKyPSRFpxZ0kZXH$Wnk#@BE%SGw!lJR#;mfA&UELxBkAMK znWmwTegay-6P*aufb;JDz?Wcf+-cM&*7mxOirWAf*U@mFzFsj_5m9AIGHfFuA!GV# zQBql#3MA$bUHDj#Je=)njo*n@CIZ&+2~a;_-2jqAo&kBP5>X`>hLD)Yl5i}!8!P<^ z^xN9g`bFsB9HV>Vp;TPpzYGPmiFt}KA4xoS9N$e{l?(=7&A^x- zf4ZC3?sYdL36bzG1U7ZxW~R7-7^{e7& x3Cq8z-1U&chW)Ib5oCKKsg(O^! Date: Thu, 15 Jun 2017 16:51:12 +0630 Subject: [PATCH 3/5] add dump.rdb in ignore --- .gitignore | 4 +++- dump.rdb | Bin 18306 -> 18306 bytes 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index f9e65957..b95c328a 100644 --- a/.gitignore +++ b/.gitignore @@ -9,7 +9,6 @@ # Ignore all logfiles and tempfiles. .DS_Store -*.rdb *.rbc *.sassc .sass-cache @@ -46,3 +45,6 @@ config/deploy/config/* # Gem files #Gemfile #Gemfile.lock + +# For Redis Server log file +!dump.rdb diff --git a/dump.rdb b/dump.rdb index 7ef364dfb335d9809431ee24ceb43df40ac926f4..c3cd28258559f24367e082ffa37d6e43dc715137 100644 GIT binary patch delta 62 zcmV-E0Kxx)j{$;@0gx~eyIw+B`UrJ%Wn?XFWo^P($dN&O1GMczk-+#1I5asfF*h+e UGc_}_!vVKN2$ssCPFO&Nj1S8g=Kufz delta 62 zcmV-E0Kxx)j{$;@0gx~ej$J}o`UrJ%Wn?XFWo^Q^$B{vN11?!Uk-+#1H8eRcFfcYT UF*P)^!vVKN2xY;uUg%+eK=C*jF#rGn From 03feae5b0f772cca25e6945e1524d9048547e384 Mon Sep 17 00:00:00 2001 From: Yan Date: Thu, 15 Jun 2017 17:57:58 +0630 Subject: [PATCH 4/5] fix get_order_items_details method in order_item and add taxes in receipt --- app/assets/javascripts/origami.js | 3 +- .../origami/discounts_controller.rb | 4 ++- app/models/order_item.rb | 32 +++++++++++------- app/models/sale.rb | 1 + app/pdf/receipt_bill_pdf.rb | 30 ++++++++++++---- dump.rdb | Bin 18306 -> 18288 bytes 6 files changed, 48 insertions(+), 22 deletions(-) diff --git a/app/assets/javascripts/origami.js b/app/assets/javascripts/origami.js index 87b74809..b1dc732d 100644 --- a/app/assets/javascripts/origami.js +++ b/app/assets/javascripts/origami.js @@ -157,10 +157,11 @@ $(document).ready(function(){ if(sale_item_id != null){ ajax_url = "/origami/" + sale_item_id + "/discount"; + sub_total = $("#"+sale_item_id).children().find("#item-total-price").text(); } // For Percentage Discount - if(discount_type == 1){ + if(discount_type == 1){ discount_amount=(sub_total*discount_value)/100; } diff --git a/app/controllers/origami/discounts_controller.rb b/app/controllers/origami/discounts_controller.rb index fb981a80..f5f7db9e 100644 --- a/app/controllers/origami/discounts_controller.rb +++ b/app/controllers/origami/discounts_controller.rb @@ -16,6 +16,7 @@ class Origami::DiscountsController < BaseOrigamiController discount_value = params[:discount_value] discount_amount = params[:discount_amount] grand_total = params[:grand_total] + product_name = "Overall Discount" if discount_type == 0 remark="Discount " + discount_amount + " as net" @@ -32,13 +33,14 @@ class Origami::DiscountsController < BaseOrigamiController #save sale item for discount if sale_item_id != nil origin_sale_item = SaleItem.find(sale_item_id) + product_name = origin_sale_item.product_name + "-Disocunt" end sale_item = SaleItem.new #pull sale_item.sale_id = sale_id sale_item.product_code = origin_sale_item != nil ? origin_sale_item.product_code : sale_id - sale_item.product_name = "Overall Discount" + sale_item.product_name = product_name sale_item.remark = remark sale_item.qty = 1 diff --git a/app/models/order_item.rb b/app/models/order_item.rb index a85d1113..564aa939 100644 --- a/app/models/order_item.rb +++ b/app/models/order_item.rb @@ -35,23 +35,29 @@ class OrderItem < ApplicationRecord #logger.debug orderitem.to_yml orderitem.save! - - end - #Origami : Cashier : to show order items details + #Origami : Cashier : to show order items details def self.get_order_items_details(booking_id) - booking_orders = BookingOrder.where("booking_id=?",booking_id) - if booking_orders - booking_orders.each do |book_order| - order_details = OrderItem.select("order_items.item_name,order_items.qty,order_items.price,(order_items.qty*order_items.price) as total_price") + # booking_orders = BookingOrder.where("booking_id=?",booking.booking_id) + # if booking_orders + # booking_orders.each do |book_order| + # order_details = OrderItem.select("order_items.item_name,order_items.qty,order_items.price,(order_items.qty*order_items.price) as total_price") + # .joins("left join orders on orders.order_id = order_items.order_id") + # .where("order_items.order_id=?",book_order.order) + # return order_details + # end + # else + # return false + # end + + order_details = OrderItem.select("order_items.item_name,order_items.qty,order_items.price,(order_items.qty*order_items.price) as total_price") .joins("left join orders on orders.order_id = order_items.order_id") - .where("order_items.order_id=?",book_order.order) - return order_details - end - else - return false - end + .joins("left join booking_orders on booking_orders.order_id = order_items.order_id") + .joins("left join bookings on bookings.booking_id = booking_orders.booking_id") + .where("bookings.booking_id=?",booking_id) + + return order_details end private diff --git a/app/models/sale.rb b/app/models/sale.rb index dee4c2f7..9683c2b2 100644 --- a/app/models/sale.rb +++ b/app/models/sale.rb @@ -186,6 +186,7 @@ class Sale < ApplicationRecord end + # Tax Calculate def apply_tax(total_taxable) #if tax is not apply create new record diff --git a/app/pdf/receipt_bill_pdf.rb b/app/pdf/receipt_bill_pdf.rb index 71562277..9d5742d6 100644 --- a/app/pdf/receipt_bill_pdf.rb +++ b/app/pdf/receipt_bill_pdf.rb @@ -165,16 +165,32 @@ class ReceiptBillPdf < Prawn::Document text "( " +"#{sale_data.total_discount}" +" )" , :size => self.item_font_size,:align => :right end - move_down 5 - y_position = cursor + if sale_data.sale_taxes.length > 1 + sale_data.sale_taxes.each do |st| + move_down 5 + y_position = cursor + + bounding_box([0,y_position], :width =>self.item_description_width, :height => self.item_height) do + text "#{ st.tax_name }", :size => self.item_font_size,:align => :left + end + bounding_box([self.item_description_width,y_position], :width =>self.label_width) do + text "( " +"#{ st.tax_payable_amount }" +" )" , :size => self.item_font_size,:align => :right + end + end + else - bounding_box([0,y_position], :width =>self.item_description_width, :height => self.item_height) do - text "Total Tax", :size => self.item_font_size,:align => :left - end - bounding_box([self.item_description_width,y_position], :width =>self.label_width) do - text "( " +"#{sale_data.total_tax}" +" )" , :size => self.item_font_size,:align => :right end + # move_down 5 + # y_position = cursor + + # bounding_box([0,y_position], :width =>self.item_description_width, :height => self.item_height) do + # text "Total Tax", :size => self.item_font_size,:align => :left + # end + # bounding_box([self.item_description_width,y_position], :width =>self.label_width) do + # text "( " +"#{sale_data.total_tax}" +" )" , :size => self.item_font_size,:align => :right + # end + move_down 5 y_position = cursor move_down 5 diff --git a/dump.rdb b/dump.rdb index c3cd28258559f24367e082ffa37d6e43dc715137..859ccbd44566f00e49a2d0a844ce85ffed07e276 100644 GIT binary patch delta 914 zcmbu7OH30%9L9H8S{m@tLbL{=EEg(4)}5W1on4`%Ee7I2qQr}dmR4G{2`xfP^nxkE z!FW*X9Jok;XuSGZG;%9cLmEvqXyPMLn|Q&*M0_N^5_MWAc=tM){J-z}ec#!OVEF>L zq--mV`40cI4aLKurf4`i|NTdm@LTxh0IapcndM-(%)(b)u4=!p+Q3xD&mP? zVoz@{(iaZRIoTqJfhFcGsRlR9BPAa#po+0Y2m36&%^iQCxC z7H9KV`l?8DVt7Ua%cb2t{X;QNMu17X5XphvIbp_15yF}}TnVv338EC~vccap1)A>i zcNX!Dub^X2RQg5pvvbKJzVIC@C||cf+OMiqH)N<16+t9P<%5I$gWb_^JRUsm8Qa*_ zKhzhBxe`)uBo>l_TA6ezk~kr``n|(-3UIk|wrA<~x#-CIlCE%%gxK^JC%v2lw@ZnJ zF`O1acaOBo^K`1=t&Du&ij7jcm=@MGl2X^;Q{T1rh9F zNylDxud15ebvhaY_g4|5XRJsi9Qf)@4N-nG|HM&byw80>o^_06(ZYcOWsIo|p#pWC zQ~v+BdOohGDGHwYlTX{|SzK=i%v&_5!=g1rxhpQNsgP=Bs^PULzV#g{R1w&bwdd^- z1a+ArgMTFKR+*oT*E(E*2P;`Qz&lpV`$AeVELNZ)Q%nsN5|(N>XMSz!w1_W#o&0LM znIz-l8q&I*+07N}5=4<2xx&#_>2%0zN zjCa+&IbjR{@s;mjK8ktX9RZe%m(R|0G gKvd%jM5PELWPWMgX9FjhyTfg(*>0cx(3YJ23nu&_#sB~S delta 847 zcmZ{iOGs2v7{~9K>ve{)$BbnQd)?cMXz+I4=UiiSW;CQlLWy8d;|$GILMr)KMG(F! zj7ko*wv>o=adp*ZY>G63pjGr@%v}&!o1jh29UOC!%ky9Se&2V#|MD#`bQ|1()lZX& zQ@;a){n<=iceeXk$9#Aqaao`FmYB%>+Kwc3Y$T9F7}2Ww2hs!e=h9slvzfV&dJB5M zM-}(gf=BLY-**F?P+;4zdJ}jV-Y6Kt3^JQjiHV4r%Cwr=%nPZOxo%%;@9|VrI~uDo zcj_Lj07i0C29wNTVsg2n^K9>6Pb_bR<3Q^wfWrlC#$cEtex({wM=*>f5;iYJSYkIC zTr$+j$}!bf`+7s!NePB3UEe9dw8qS98k+pMf_-6aiR&H~7PMKwkkzEEVuhqdEP_a= z`+IM=4?{`4L_V}{VY4R8JrzVqo5zBHNcF^jrZG2d5H1`{Cx5KapKIi5s5EqL#xEe} zn8-4oA;N7hqnzgBONsX4XN|byThj(uRDWtl)z`>E$kPN%8it`mdC`-MYSV@woY6H~ zlszyv>lauM$;GONAZdGDO;uheFlRPn1g6w( ztGUfQzfK{B3t&p;5Yqql!L8&(B1p=!U`nXXiWx`9ts`G_m5GeGjiv9H>K~O&az62U}hmLdscd_AE0Ay68 PB^tQ*>OpHqZ1m<|2)X~@ From a290e795aeccaebc083a1c566fb57327ddfaa3d3 Mon Sep 17 00:00:00 2001 From: Yan Date: Thu, 15 Jun 2017 17:59:02 +0630 Subject: [PATCH 5/5] dump.rdb in ignore --- .gitignore | 2 +- dump.rdb | Bin 18288 -> 18288 bytes 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index b95c328a..91a498bc 100644 --- a/.gitignore +++ b/.gitignore @@ -47,4 +47,4 @@ config/deploy/config/* #Gemfile.lock # For Redis Server log file -!dump.rdb +dump.rdb diff --git a/dump.rdb b/dump.rdb index 859ccbd44566f00e49a2d0a844ce85ffed07e276..656b5df8faab2f18daae73fe357503eb308f8cf3 100644 GIT binary patch delta 63 zcmV-F0Kot7jsftF0gx~fF>gXy`UrJ%Wn?XFWo^PBXcv(}djlUdgOR}Z3pOw|F)lSQ VGBq|dv%&$UMF>?ry~w%a^P~UW80i22 delta 63 zcmV-F0Kot7jsftF0gx~f1a3lE`UrJ%Wn?XFWo^Rv`4f>sdjp)Gev!cU3pF=3F)lMR VIW{plv%&$UMF<-m5V`C_fVn_V88QF>