From cc06d93d3048c24a72e68cbc1e40a23f7883440d Mon Sep 17 00:00:00 2001 From: FrancescoUK Date: Mon, 3 Aug 2015 22:48:32 +0100 Subject: [PATCH] Remove LICENSE file (use COPYING now instead) Update agency_name constraint in update script Show supplier_id in suppliers for use with item excel import --- LICENSE | 20 -------------------- application/helpers/table_helper.php | 6 +++++- database/2.3.2_to_2.3.3.sql | 2 +- test/giftcard_numbering.js | 4 ++-- 4 files changed, 8 insertions(+), 24 deletions(-) delete mode 100644 LICENSE diff --git a/LICENSE b/LICENSE deleted file mode 100644 index e0534b189..000000000 --- a/LICENSE +++ /dev/null @@ -1,20 +0,0 @@ -The MIT License (MIT) - -Copyright (c) 2014 pappastech - -Permission is hereby granted, free of charge, to any person obtaining a copy of -this software and associated documentation files (the "Software"), to deal in -the Software without restriction, including without limitation the rights to -use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of -the Software, and to permit persons to whom the Software is furnished to do so, -subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS -FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR -COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER -IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN -CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/application/helpers/table_helper.php b/application/helpers/table_helper.php index 8cd8880bb..4c3d526ac 100644 --- a/application/helpers/table_helper.php +++ b/application/helpers/table_helper.php @@ -164,8 +164,10 @@ function get_supplier_manage_table($suppliers,$controller) $CI->lang->line('suppliers_agency_name'), $CI->lang->line('common_last_name'), $CI->lang->line('common_first_name'), + $CI->lang->line('common_last_name'), $CI->lang->line('common_email'), $CI->lang->line('common_phone_number'), + $CI->lang->line('suppliers_supplier_id'), ' '); $table.=''; @@ -212,9 +214,11 @@ function get_supplier_data_row($supplier,$controller) $table_data_row.=''.character_limiter($supplier->agency_name,13).''; $table_data_row.=''.character_limiter($supplier->last_name,13).''; $table_data_row.=''.character_limiter($supplier->first_name,13).''; + $table_data_row.=''.character_limiter($supplier->last_name,13).''; $table_data_row.=''.mailto($supplier->email,character_limiter($supplier->email,22)).''; $table_data_row.=''.character_limiter($supplier->phone_number,13).''; - $table_data_row.=''.anchor($controller_name."/view/$supplier->person_id/width:$width", $CI->lang->line('common_edit'),array('class'=>'thickbox','title'=>$CI->lang->line($controller_name.'_update'))).''; + $table_data_row.=''.character_limiter($supplier->person_id,5).''; + $table_data_row.=''.anchor($controller_name."/view/$supplier->person_id/width:$width", $CI->lang->line('common_edit'),array('class'=>'thickbox','title'=>$CI->lang->line($controller_name.'_update'))).''; $table_data_row.=''; return $table_data_row; diff --git a/database/2.3.2_to_2.3.3.sql b/database/2.3.2_to_2.3.3.sql index 168865d99..871f4aaf9 100644 --- a/database/2.3.2_to_2.3.3.sql +++ b/database/2.3.2_to_2.3.3.sql @@ -1,2 +1,2 @@ ALTER TABLE `ospos_suppliers` - ADD COLUMN `agency_name` VARCHAR(255); + ADD COLUMN `agency_name` VARCHAR(255) NOT NULL; diff --git a/test/giftcard_numbering.js b/test/giftcard_numbering.js index 383d8eea1..f32be9eed 100644 --- a/test/giftcard_numbering.js +++ b/test/giftcard_numbering.js @@ -28,10 +28,10 @@ describe("giftcard numbering test", function () { it("issue #65: giftcard numbering should add properly", function() { return this.browser.get(url("/index.php/giftcards")).waitForElementByCss(".big_button").click() - .waitForElementByName("value", 2000).type("100").elementById('giftcard_number').clear().type("10") + .waitForElementByName("value", 4000).type("100").elementById('giftcard_number').clear().type("10") .elementById("submit").click().waitForElementByXPath("//table/tbody/tr[td/text()='10']/td[4]", 2000).text().then(function (value) { assert.ok(value, "giftcard failed to be added properly!"); - }).elementByCss(".big_button").click().waitForElementByName("value", 2000).type("100").elementById("submit").click() + }).elementByCss(".big_button").click().waitForElementByName("value", 4000).type("100").elementById("submit").click() .waitForElementByXPath("//table/tbody/tr[td/text()='11']/td[4]").text().then(function (value) { assert.equal(value, "11", "giftcard number not incrementing properly!!"); });