kopia lustrzana https://github.com/magicbug/Cloudlog
Moved from paper_id to paper_name
rodzic
ed6ca09b67
commit
4a19e00965
|
@ -158,7 +158,7 @@ class Labels extends CI_Controller {
|
||||||
try {
|
try {
|
||||||
if ($label) {
|
if ($label) {
|
||||||
$ptype=$this->labels_model->getPaperType($label->paper_type); // fetch papersize out of paper-table
|
$ptype=$this->labels_model->getPaperType($label->paper_type); // fetch papersize out of paper-table
|
||||||
var_dump($ptype);
|
// var_dump($ptype);
|
||||||
$pdf = new PDF_Label(array(
|
$pdf = new PDF_Label(array(
|
||||||
'paper-size' => 'custom', // $label->paper_type, // The only Type left is "custom" because A4 and so on are also defined at paper_types
|
'paper-size' => 'custom', // $label->paper_type, // The only Type left is "custom" because A4 and so on are also defined at paper_types
|
||||||
'metric' => $label->metric,
|
'metric' => $label->metric,
|
||||||
|
|
|
@ -119,7 +119,7 @@ class Labels_model extends CI_Model {
|
||||||
|
|
||||||
function getPaperType($ptype) {
|
function getPaperType($ptype) {
|
||||||
$this->db->where('user_id', $this->session->userdata('user_id'));
|
$this->db->where('user_id', $this->session->userdata('user_id'));
|
||||||
$this->db->where('id',$ptype);
|
$this->db->where('paper_name',$ptype);
|
||||||
$query = $this->db->get('paper_types');
|
$query = $this->db->get('paper_types');
|
||||||
|
|
||||||
return $query->row();
|
return $query->row();
|
||||||
|
|
|
@ -72,7 +72,7 @@ class PDF_Label extends tfpdf {
|
||||||
function __construct($format, $unit='mm', $posX=1, $posY=1, $pgX=0,$pgY=0) {
|
function __construct($format, $unit='mm', $posX=1, $posY=1, $pgX=0,$pgY=0) {
|
||||||
if (is_array($format)) {
|
if (is_array($format)) {
|
||||||
// Custom format
|
// Custom format
|
||||||
var_dump("X".$pgX);
|
// var_dump("X".$pgX);
|
||||||
$Tformat = $format;
|
$Tformat = $format;
|
||||||
} else {
|
} else {
|
||||||
// Built-in format
|
// Built-in format
|
||||||
|
|
Ładowanie…
Reference in New Issue