Changeset 157696d

Timestamp:

Feb 6, 2011, 1:22:38 AM (13 years ago)

Author:

Blacklight <blacklight@…>

Branches:

master

Children:

f0d544a

Parents:

b850a3a

Message:

• Возможность переопределения внешнего вида главной страницы
• Добавление свойства *распродажа*

Files:

• db_struct.sql (modified) (4 diffs)
• web/include/doc.s.sklad.php (modified) (7 diffs)
• web/index.php (modified) (1 diff)

db_struct.sql

@@ -192 +192 @@
   `desc` text NOT NULL COMMENT 'Описание',
   `cost` double(10,2) NOT NULL default '0.00' COMMENT 'Цена',
+  `stock` tinyint(1) NOT NULL default '0' COMMENT 'Распродажа',
   `proizv` varchar(24) NOT NULL COMMENT 'Производитель',
   `likvid` decimal(6,2) NOT NULL default '0.00' COMMENT 'Ликвидность',
@@ -201 +202 @@
   KEY `group` (`group`),
   KEY `name` (`name`),
+  KEY `stock` (`stock`),
   KEY `cost_date` (`cost_date`),
   KEY `hidden` (`hidden`),
   KEY `unit` (`unit`),
   KEY `vc` (`vc`)
-) ENGINE=InnoDB  DEFAULT CHARSET=utf8 AUTO_INCREMENT=3 ;
+) ENGINE=InnoDB  DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
 
 --
@@ -953 +955 @@
 CREATE TABLE IF NOT EXISTS `news` (
   `id` int(11) NOT NULL auto_increment,
-  `text` text character set utf8 collate utf8_swedish_ci NOT NULL,
+  `title` varchar(64) NOT NULL,
+  `text` text  NOT NULL,
   `date` datetime NOT NULL,
   `owner` int(11) NOT NULL,
   UNIQUE KEY `id` (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=1 ;
+) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
 
 --
@@ -985 +988 @@
   KEY `senddate` (`senddate`),
   KEY `enddate` (`enddate`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=1 ;
+) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
 
 --

web/include/doc.s.sklad.php

@@ -152 +152 @@
                 if($param=='')
                 {
-                        $res=mysql_query("SELECT `doc_base`.`group`, `doc_base`.`name`, `doc_base`.`desc`, `doc_base`.`proizv`, `doc_base`.`cost`, `doc_base`.`likvid`, `doc_img`.`id`, `doc_img`.`type`, `doc_base`.`pos_type`, `doc_base`.`hidden`, `doc_base`.`unit`, `doc_base`.`vc`
+                        $res=mysql_query("SELECT `doc_base`.`group`, `doc_base`.`name`, `doc_base`.`desc`, `doc_base`.`proizv`, `doc_base`.`cost`, `doc_base`.`likvid`, `doc_img`.`id`, `doc_img`.`type`, `doc_base`.`pos_type`, `doc_base`.`hidden`, `doc_base`.`unit`, `doc_base`.`vc`, `doc_base`.`stock`
                         FROM `doc_base`
                         LEFT JOIN `doc_base_img` ON `doc_base_img`.`pos_id`=`doc_base`.`id` AND `doc_base_img`.`default`='1'
@@ -203 +203 @@
                         
                         if($nxt[9])     $hid_check='checked';
+                        if($nxt[12])    $stock_check='checked';
                         
                         $tmpl->AddText("</select>
@@ -219 +220 @@
                         <tr class='lin0'><td align='right'>Ликвидность:<td><b>$nxt[5]%</b>
                         <tr class='lin1'><td align='right'>Скрытность:<td><label><input type='checkbox' name='hid' value='1' $hid_check>Не отображать на витрине</a>
-                        <tr class='lin0'><td align='right'>Описание<td colspan='2'><textarea name='desc'>$nxt[2]</textarea>");
+                        <tr class='lin0'><td align='right'>Распродажа:<td><label><input type='checkbox' name='stock' value='1' $stock_check>Поместить в спецпредложения</a>
+                        <tr class='lin1'><td align='right'>Описание<td colspan='2'><textarea name='desc'>$nxt[2]</textarea>");
                         if($pos!=0)
-                                $tmpl->AddText("<tr class='lin1'><td align='right'>Режим записи:<td>
+                                $tmpl->AddText("<tr class='lin0'><td align='right'>Режим записи:<td>
                                 <label><input type='radio' name='sr' value='0' checked>Сохранить</label><br>
                                 <label><input type='radio' name='sr' value='1'>Добавить</label><br>");
-                        $tmpl->AddText("<tr class='lin0'><td><td><input type='submit' value='Сохранить'>
+                        $tmpl->AddText("<tr class='lin1'><td><td><input type='submit' value='Сохранить'>
                         <script type='text/javascript' src='/css/jquery/jquery.js'></script>
                         <script type='text/javascript' src='/css/jquery/jquery.autocomplete.js'></script>
@@ -679 +681 @@
                         $desc=rcv('desc');
                         $cost=rcv('cost');
+                        $stock=rcv('stock');
                         $sr=rcv('sr');
                         $pos_type=rcv('pos_type');
@@ -685 +688 @@
                         $vc=rcv('vc');
                         if(!$hid)       $hid=0;
+                        if(!$stock)     $stock=0;
                         $cc='Цена осталась прежняя!';
                         if( ($pos)&&(!$sr) )
                         {
                                 $sql_add=$log_add='';
-                                $res=mysql_query("SELECT `group`, `name`, `desc`, `proizv`, `cost`, `likvid`, `hidden`, `unit`, `vc` FROM `doc_base` WHERE `id`='$pos'");
+                                $res=mysql_query("SELECT `group`, `name`, `desc`, `proizv`, `cost`, `likvid`, `hidden`, `unit`, `vc`, `stock` FROM `doc_base` WHERE `id`='$pos'");
                                 if(mysql_errno())       throw new MysqlException("Не удалось получить старые свойства позиции!");
                                 $old_data=mysql_fetch_assoc($res);
@@ -732 +736 @@
                                         $sql_add.=", `hidden`='$hid'";
                                         $log_add.=", hidden:({$old_data['hidden']} => $hid)";
+                                }
+                                if($old_data['stock']!=$stock)
+                                {
+                                        $sql_add.=", `stock`='$stock'";
+                                        $log_add.=", stock:({$old_data['stock']} => $stock)";
                                 }
                                 if($old_data['unit']!=$unit)
@@ -751 +760 @@
                         else
                         {       
-                                $res=mysql_query("INSERT INTO `doc_base` (`name`, `group`, `proizv`, `desc`, `cost`, `cost_date`, `pos_type`, `hidden`, `unit`)
-                                VALUES  ('$pos_name', '$g', '$proizv', '$desc', '$cost', NOW() , '$pos_type', '$hid', '$unit')");
+                                $res=mysql_query("INSERT INTO `doc_base` (`name`, `group`, `proizv`, `desc`, `cost`, `stock`, `cost_date`, `pos_type`, `hidden`, `unit`)
+                                VALUES  ('$pos_name', '$g', '$proizv', '$desc', '$cost', '$stock', NOW() , '$pos_type', '$hid', '$unit')");
                                 $opos=$pos;
                                 $pos=mysql_insert_id();

web/index.php

@@ -19 +19 @@
 //
 
-include_once("vitrina.php");
+include_once("core.php");
+
+if(file_exists( $CONFIG['site']['location'].'/skins/'.$CONFIG['site']['skin'].'/index.tpl.php' ) )
+        include_once($CONFIG['site']['location'].'/skins/'.$CONFIG['site']['skin'].'/index.tpl.php');
+else    include_once("vitrina.php");
 ?>