merge with master

This commit is contained in:
Yan
2017-06-02 16:52:58 +06:30
parent 7e46e3c634
commit 6d705e2860
8 changed files with 44 additions and 1 deletions

View File

@@ -0,0 +1,5 @@
class Oqs::PrintController < ApplicationController
def print
end
end

View File

@@ -0,0 +1,2 @@
module Oqs::PrintHelper
end

View File

@@ -197,7 +197,7 @@
<!-- Column Three--->
<div class="col-lg-1 col-md-1 col-sm-1">
<!-- OQS Buttons -->
<button type="button" class="btn btn-primary btn-lg btn-block" disabled>Print</button>
<a href=<%= oqs_print_path %> title="Print Order Item" class="btn btn-primary btn-lg btn-block">Print</a>
<button type="button" class="btn btn-primary btn-lg btn-block" disabled>Print <br/>Order<br/>Summary</button>
</div>

View File

@@ -0,0 +1,2 @@
<h1>Oqs::Print#print</h1>
<p>Find me in app/views/oqs/print/print.html.erb</p>

View File

@@ -99,6 +99,8 @@ Rails.application.routes.draw do
root "home#index"
post 'update_delivery', to: "home#update_delivery_status"
get 'print/print'
#dashboard
#
end

View File

@@ -0,0 +1,12 @@
require 'rails_helper'
RSpec.describe Oqs::PrintController, type: :controller do
describe "GET #print" do
it "returns http success" do
get :print
expect(response).to have_http_status(:success)
end
end
end

View File

@@ -0,0 +1,15 @@
require 'rails_helper'
# Specs in this file have access to a helper object that includes
# the Oqs::PrintHelper. For example:
#
# describe Oqs::PrintHelper do
# describe "string concat" do
# it "concats two strings with spaces" do
# expect(helper.concat_strings("this","that")).to eq("this that")
# end
# end
# end
RSpec.describe Oqs::PrintHelper, type: :helper do
pending "add some examples to (or delete) #{__FILE__}"
end

View File

@@ -0,0 +1,5 @@
require 'rails_helper'
RSpec.describe "print/print.html.erb", type: :view do
pending "add some examples to (or delete) #{__FILE__}"
end