Skip to content

Commit

Permalink
exit削除漏れ
Browse files Browse the repository at this point in the history
  • Loading branch information
inunosinsi committed Oct 15, 2018
1 parent 2e36e94 commit 63509d5
Show file tree
Hide file tree
Showing 6 changed files with 11 additions and 11 deletions.
2 changes: 1 addition & 1 deletion cms/app/webapp/shop/application.ini
@@ -1,7 +1,7 @@
[application]
title = "SOY Shop"
description = "ショッピングサイト構築"
version = "1.18.2p40"
version = "1.18.2p41"

[author]
author_name = "SOY Shop開発チーム"
Expand Down
3 changes: 2 additions & 1 deletion cms/soyshop/webapp/pages/Order/Mail/IndexPage.class.php
Expand Up @@ -195,11 +195,12 @@ function getMailContent($type, SOYShop_Order $order, $array, MailLogic $mailLogi
}

$id = ($downloadPlugin->getIsActive() == 1) ? "soyshop.order.mail.user" : $id;

$delegate = SOYShopPlugin::invoke($id, array(
"order" => $order,
"mail" => $array
));

$appned_body = ($delegate) ? $delegate->getBody() : "";

$mailBody = $array["header"] ."\n". $body . $appned_body . "\n" . $array["footer"];
Expand Down
Expand Up @@ -19,7 +19,7 @@ function getMailBody(SOYShop_Order $order){
function getDisplayOrder(){
return 1;
}

private $isUse = false;

function setIsUse($flag){
Expand All @@ -29,7 +29,7 @@ function setIsUse($flag){
function isUse(){
return $this->isUse;
}

public function setOrder($order){
$this->order = $order;
}
Expand All @@ -46,6 +46,7 @@ function run($extetensionId,$moduleId,SOY2PluginAction $action){

//常にorderの値が入っていなければ不便
$action->setOrder($order);
$action->setIsUse(false); //メール送信時に複数選択されているように見える不具合があるため、都度falseに初期化しておく

//注文時に選択されていればisUseフラグを立てる
if($order){
Expand All @@ -72,16 +73,16 @@ function run($extetensionId,$moduleId,SOY2PluginAction $action){
function getBody(){
//小さいものから並べる
ksort($this->body);

$res = "";

//改行で連結
foreach($this->body as $displayGroup){
foreach($displayGroup as $module){
if(strlen($module) > 0) $res .= $module."\n";
}
}

return $res;
}

Expand All @@ -100,4 +101,3 @@ function setOrder($order) {
SOYShopPlugin::registerExtension("soyshop.order.mail.confirm","SOYShopOrderMailDeletageAction");
SOYShopPlugin::registerExtension("soyshop.order.mail.payment","SOYShopOrderMailDeletageAction");
SOYShopPlugin::registerExtension("soyshop.order.mail.delivery","SOYShopOrderMailDeletageAction");
?>
Expand Up @@ -2,6 +2,6 @@
name="返送伝票番号記録プラグイン"
type="admin"
description="返送伝票番号を記録するプラグイン"
version="0.9.8"
version="0.9.9"
link=""
label=""
Expand Up @@ -79,7 +79,7 @@ function doPost(){
if(isset($v[2])){
if(strpos($v[2], "配達") === false || strpos($v[2], "完了") === false) continue;
}

$slipNumber = trim(str_replace("\"", "", $v[0]));

try{
Expand All @@ -91,7 +91,6 @@ function doPost(){
$slipLogic->changeStatus((int)$slipId, "return");
}
}
exit;

SOY2PageController::jump("Extension.returns_slip_number?updated");
}
Expand Down
Binary file not shown.

0 comments on commit 63509d5

Please sign in to comment.