软件接口相关

global/js/receipt.js

@@ -546,8 +546,8 @@ $(function() {
 	        'trainName':'required; ',
 	        'trainStartDate':'required; ',
 	        'trainEndDate':'required; ',
-	        'participants':'required; ',
-	        'freeParticipants':'required; ',
+	        //'participants':'required; ',
+	        //'freeParticipants':'required; ',
 	        'trainAddress':'required; ',
 	    }
 	});

protected/config/js.edition.conf.php

@@ -3,7 +3,7 @@
 define ( "index", WEB_SITE_GLOBAL.'js/index.js?1.07' );
 define ( "receiptExtend", WEB_SITE_GLOBAL.'js/receiptExtend.js?1.03' );
 
-define ( "receipt", WEB_SITE_GLOBAL.'js/receipt.js?1.05' );
+define ( "receipt", WEB_SITE_GLOBAL.'js/receipt.js?1.09' );
 define ( "invoice", WEB_SITE_GLOBAL.'js/invoice.js?1.02' );
 define ( "payments", WEB_SITE_GLOBAL.'js/payments.js?1.02' );
 define ( "invoiceValidator", WEB_SITE_GLOBAL.'js/invoice.validator.js?1.01' );

protected/config/routes.conf.php

@@ -7,6 +7,7 @@ $route['*']['/product/list.json'] = array('SoftController', 'productApi');
 $route['post']['/longle/list/add'] = array('SoftController', 'addLockApi');
 $route['*']['/longle/list/update'] = array('SoftController', 'updateLockApi');
 $route['*']['/longle/list/alteration'] = array('SoftController', 'alterationLongle');
+$route['*']['/longle/syncData'] = array('SoftController', 'syncLongleData');
 
 $route['get']['/longle/test'] = array('SoftController', 'longleTest');
 

protected/controller/InvoiceController.php

@@ -3073,7 +3073,7 @@ class InvoiceController extends DooController {
 		
 		$invoiceDetails = $invoice->getInvoiceByIid ( $iid );
 		if ($invoiceDetails ['untreadStatus'] != 1)
-			die ( 'illegal request' );
+			die ( 'illegal request untreadStatus error !=1' );
 		
 		$item = array (
 				'iid' => $iid,

protected/controller/MainController.php

@@ -185,6 +185,19 @@ class MainController extends DooController {
 			$userinfo = $staff->checkUser ( $uid, $passwork );
 			if (! empty ( $userinfo )) {
 				setcookie ( "staff", $XDeode->encode ( $userinfo [0] ['sid'] ), time () + 36000, "/" );
+				
+				
+// 				$text = 'CLDV2_CP';
+// 				$algorithm = 'aes192';
+// 				$password = '1234567890abcdef1234567890abcdef'; //node js required 32 byte length key
+// 				$iv = '1234567890abcdef'; //must be 16 byte length OPENSSL_RAW_DATA
+// 				$staffV2= bin2hex(openssl_encrypt($userinfo [0] ['sid'] , $algorithm, $text )); 
+				
+				Doo::loadClass ( 'crypto' );
+				$crypto = new crypto ( );
+				$staffV2=$crypto->encrypt( $userinfo [0] ['sid'],'CLDV2_CP');
+				setcookie ( "staffV2", $staffV2, time () + 36000, "/" );
+				
 				return "/";
 			}
 		}
@@ -209,6 +222,7 @@ class MainController extends DooController {
 	}
 	function out() {
 		setcookie ( "staff", "", time () - 3600, "/" );
+		setcookie ( "staffV2", "", time () - 3600, "/" );
 		return "/";
 	}
 	function test() {

protected/controller/ReceiptController.php

@@ -318,7 +318,7 @@ class ReceiptController extends DooController {
 			// $receiptDetail=$receipt->getOne(array('where'=>'staff='.$this->staff[0]['sid'].' and status=4','asArray'=>true));
 			
 			$aItem = $accountItem->find ( array (
-					'where' => '(name like "办公费用" or name like "邮寄费" or name like "其他费用" or name like "公积金" or name like "社保") and category like "'.$this->AGENCY.'"',
+					'where' => '(name like "办公费用" or name like "服务器费用" or name like "邮寄费" or name like "其他费用" or name like "公积金" or name like "社保") and category like "'.$this->AGENCY.'"',
 					'asArray' => true 
 			) );
 			$accountJson [$this->AGENCY] = $accountJson [$this->TRAVEL] = $accountJson [$this->TRAIN] = $accountJson [$this->OTHER] = array ();
@@ -548,7 +548,7 @@ class ReceiptController extends DooController {
 				return "/saeaBorad";
 				
 			$aItem = $accountItem->find ( array (
-					'where' => '(name like "办公费用" or name like "邮寄费" or name like "其他费用" or name like "公积金" or name like "社保") and category like "'.$this->AGENCY.'"',
+					'where' => '(name like "办公费用" or name like "服务器费用" or name like "邮寄费" or name like "其他费用" or name like "公积金" or name like "社保") and category like "'.$this->AGENCY.'"',
 					'asArray' => true 
 			) );
 			$accountJson [$this->AGENCY] = $accountJson [$this->TRAVEL] = $accountJson [$this->TRAIN] = $accountJson [$this->OTHER] = array ();
@@ -2109,7 +2109,8 @@ class ReceiptController extends DooController {
 		$coupletNumber = $this->get_args ( 'coupletNumber' ) ? $this->get_args ( 'coupletNumber' ) : "";
 		$remittanceBankType = $this->get_args ( 'remittanceBankType' ) && is_numeric ( $this->get_args ( 'remittanceBankType' ) ) ? $this->get_args ( 'remittanceBankType' ) : 0;
 		
-		if (! empty ( $verify ) && ! empty ( $cid ) && ! empty ( $remittanceName ) && ! empty ( $bankName ) && ! empty ( $bankNumber ) && ! empty ( $trainName ) && ! empty ( $trainStartDate ) && ! empty ( $trainEndDate ) && ! empty ( $participants ) && ! empty ( $trainAddress )) {
+		//&&! empty ( $participants )
+		if (! empty ( $verify )  && ! empty ( $cid ) && ! empty ( $remittanceName ) && ! empty ( $bankName ) && ! empty ( $bankNumber ) && ! empty ( $trainName ) && ! empty ( $trainStartDate ) && ! empty ( $trainEndDate )  && ! empty ( $trainAddress )) {
 			
 			if ($remittanceBankType == 1 && empty ( $coupletNumber )) {
 				header ( 'Content-Type:text/html;charset=utf-8' );
@@ -2437,7 +2438,8 @@ class ReceiptController extends DooController {
 		$coupletNumber = $this->get_args ( 'coupletNumber' ) ? $this->get_args ( 'coupletNumber' ) : "";
 		$remittanceBankType = $this->get_args ( 'remittanceBankType' ) && is_numeric ( $this->get_args ( 'remittanceBankType' ) ) ? $this->get_args ( 'remittanceBankType' ) : 0;
 		
-		if (! empty ( $verify ) && ! empty ( $cid ) && ! empty ( $remittanceName ) && ! empty ( $bankName ) && ! empty ( $bankNumber ) && ! empty ( $trainName ) && ! empty ( $trainStartDate ) && ! empty ( $trainEndDate ) && ! empty ( $participants ) && ! empty ( $trainAddress )) {
+		//&& ! empty ( $participants )
+		if (! empty ( $verify ) && ! empty ( $cid ) && ! empty ( $remittanceName ) && ! empty ( $bankName ) && ! empty ( $bankNumber ) && ! empty ( $trainName ) && ! empty ( $trainStartDate ) && ! empty ( $trainEndDate )  && ! empty ( $trainAddress )) {
 			
 			if ($remittanceBankType == 1 && empty ( $coupletNumber )) {
 				header ( 'Content-Type:text/html;charset=utf-8' );
@@ -4071,7 +4073,7 @@ class ReceiptController extends DooController {
 			$approvalCondition = " and status=3";
 		}
 		if ($status == 'finish') {
-			$approvalCondition = " and (status=1 or status=8 or status=9)";
+			$approvalCondition = " and (status=1 or status=8 or status=9 or status=10)";
 		}
 		
 		$pageinfo ['page'] = array (

protected/model/invoice.php

@@ -365,7 +365,7 @@ class invoice extends DooModel {
 // 		return $detail;
 	}
 	
-	//办事处收款 有问题
+	//办事处收款 有问题--已经退票的发票，还会统计到办事处收款中BUG--点击办事处已收款后，在退票就会出现统计错误
 	function sumOfInvoiceByItid($itidSql=0){
 		$sql = 'select sum(a.invoicePrice) as invoicePrice ,a.trainId as trainId,a.iid
 				from CLD_RIExtend  as b left join ' . $this->_table . ' as a  on (a.iid=b.iid)

protected/view/admin/invoiceUntreadAchieve.html

@@ -41,7 +41,9 @@
 				<div class="saeaList">
 					<table class="table table-hover">
 						<tbody>
-						<tr class="thead"><th>开票流水号</th><th>开票单位（抬头）</th><th>开票金额</th><th>发票号</th><th>提交退票</th><th>快递信息</th><th>确认退票</th>
+						<tr class="thead"><th>开票流水号</th><th>开票单位（抬头）</th><th>开票金额</th><th>发票号</th>
+						<th>退票原因</th>
+						<th>提交退票</th><th>快递信息</th><th>确认退票</th>
 						<th >负票抵销</th></tr>
 						
 						<!-- loop list -->
@@ -61,6 +63,7 @@
 							</td>
 							
 							<td>{{list' value.invoiceNo}}</td>
+							<td>{{list' value.untreadReason}}</td>
 							
 							<td>{{list' value.categoryName}}{{list' value.userName}} {{list' value.date}}</td>
 							<td>{{invoiceList' value.untreadCompany}}:

protected/view/admin/remitAdd.html

@@ -42,7 +42,7 @@
 	  						<tr><th colspan="2" class="taC">办事处相关费用</th></tr>
 	  						<!-- loop acItem -->
 		  						<!-- if {{acItem' value.category}} =="日常相关费用" -->
-			  						<!-- if {{acItem' value.name}}=="办公费用" || {{acItem' value.name}}=="其他费用" || {{acItem' value.name}}=="公积金" || {{acItem' value.name}}=="社保" || {{acItem' value.name}}=="邮寄费" -->
+			  						<!-- if {{acItem' value.name}}=="办公费用" || {{acItem' value.name}}=="其他费用" || {{acItem' value.name}}=="公积金" || {{acItem' value.name}}=="社保" || {{acItem' value.name}}=="邮寄费" || {{acItem' value.name}}=="服务器费用" -->
 			  						<tr>
 			  						<th>{{acItem' value.name}}</th>
 			  						<td  width="200" class="taR">￥<input type="number" id="agency_{{acItem' value.aid}}" name="agency[]" value="0" placeholder="输入{{acItem' value.name}}" pattern="[0-9]" step="0.01" min="0" class="span2">

protected/view/admin/remitEdit.html

@@ -42,7 +42,7 @@
 	  						
 	  						<!-- loop acItem -->
 		  						<!-- if {{acItem' value.category}} =="日常相关费用" -->
-			  						<!-- if {{acItem' value.name}}=="办公费用" || {{acItem' value.name}}=="其他费用" || {{acItem' value.name}}=="公积金" || {{acItem' value.name}}=="社保" || {{acItem' value.name}}=="邮寄费" -->
+			  						<!-- if {{acItem' value.name}}=="办公费用" || {{acItem' value.name}}=="其他费用" || {{acItem' value.name}}=="公积金" || {{acItem' value.name}}=="社保" || {{acItem' value.name}}=="邮寄费" || {{acItem' value.name}}=="服务器费用" -->
 			  						<tr>
 			  						<th>{{acItem' value.name}}</th>
 			  						<td  width="200" class="taR">￥<input type="number" id="agency_{{acItem' value.aid}}" name="agency[]" <!-- if !empty({{acItem' value.price}}) --> value="{{acItem' value.price}}" <!-- else --> value="0" <!-- endif --> placeholder="输入{{acItem' value.name}}" pattern="[0-9]" step="0.01" min="0" class="span2">