Merge remote-tracking branch 'origin/master'

master
Tayl0r 7 years ago
commit ec4cf679e8

@ -1,40 +0,0 @@
package au.com.royalpay.payment.manage.dev.web;
import au.com.royalpay.payment.manage.support.wechatclients.KangaLandWechatApiImpl;
import au.com.royalpay.payment.manage.support.wechatclients.RedpackWechatApiImpl;
import au.com.royalpay.payment.tools.connections.mpsupport.beans.WxOauthType;
import au.com.royalpay.payment.tools.env.PlatformEnvironment;
import au.com.royalpay.payment.tools.env.RequestEnvironment;
import au.com.royalpay.payment.tools.exceptions.ForbiddenException;
import au.com.royalpay.payment.tools.permission.wechat.WechatMapping;
import com.alibaba.fastjson.JSONObject;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;
/**
* Created by davep on 2016-09-04.
*/
@RestController
@RequestMapping("/dev/status")
public class StatusCheckController {
@RequestMapping(method = RequestMethod.GET)
public JSONObject checkSystemStatus(){
return new JSONObject();
}
@WechatMapping(value = "wx_test",method = RequestMethod.GET,oauthType = WxOauthType.USERINFO,addonMp = {RedpackWechatApiImpl.class,KangaLandWechatApiImpl.class})
public void checkWxTest(){
}
@RequestMapping(value = "/stopping",method = RequestMethod.PUT)
public void beforeStop(){
if (RequestEnvironment.getClientIp().equals("127.0.0.1")){
PlatformEnvironment.getEnv().taskEnabled(false);
}else{
throw new ForbiddenException();
}
}
}

@ -187,7 +187,7 @@ public class ActRedPackServiceImpl implements ActRedPackService {
wechatRedpack.setWishing(wishing); wechatRedpack.setWishing(wishing);
wechatRedpack.setRemark("开业红包活动"); wechatRedpack.setRemark("开业红包活动");
logger.info("==============Send RedPacket Service:" + wechatRedpack.toString() + "========="); logger.info("==============Send RedPacket Service:" + wechatRedpack.toString() + "=========");
String redPacketId = redpackApi.sendRedpack(wechatRedpack).getString("redpack_id"); String redPacketId = redpackApi.sendRedpack(wechatRedpack).getString("out_biz_no");
prizeDetail.put("red_packet_id", redPacketId); prizeDetail.put("red_packet_id", redPacketId);
prizeDetail.put("status", 1); prizeDetail.put("status", 1);
actRedPacketsCustomerOrdersMapper.update(prizeDetail); actRedPacketsCustomerOrdersMapper.update(prizeDetail);

@ -274,7 +274,7 @@ public class PartnerLMServiceImp implements PartnerLMService {
String rpOpenId = customerRelation.getString(redpackApi.getOpenIdKey()); String rpOpenId = customerRelation.getString(redpackApi.getOpenIdKey());
wechatRedpack.setSendName(sendName).setOpenId(rpOpenId).setActName(actName) wechatRedpack.setSendName(sendName).setOpenId(rpOpenId).setActName(actName)
.setRemark("商家激励计划").setAmount(new BigDecimal(luckyMoney).setScale(2, ROUND_DOWN)).setWishing(wishing).setNotifyUrl(notifyUrl); .setRemark("商家激励计划").setAmount(new BigDecimal(luckyMoney).setScale(2, ROUND_DOWN)).setWishing(wishing).setNotifyUrl(notifyUrl);
String redPacketId = redpackApi.sendRedpack(wechatRedpack).getString("redpack_id"); String redPacketId = redpackApi.sendRedpack(wechatRedpack).getString("out_biz_no");
send.put("red_packet_id", redPacketId); send.put("red_packet_id", redPacketId);
actPartnerLMLogMapper.saveLog(send); actPartnerLMLogMapper.saveLog(send);
} }

@ -127,12 +127,12 @@ public class RedpackServiceImpl implements RedpackService {
} }
try { try {
WechatRedpack redpack = newRedpack(config, orderOpenId); WechatRedpack redpack = newRedpack(config, orderOpenId);
String redpackId = mpWechatApiProvider.getApi("Redpack").sendRedpack(redpack).getString("redpack_id"); String redpackId = mpWechatApiProvider.getApi("Redpack").sendRedpack(redpack).getString("out_biz_no");
JSONObject obj = redpack.toJSON(); JSONObject obj = redpack.toJSON();
obj.put("redpack_id",redpackId); obj.put("redpack_id", redpackId);
obj.put("create_time", new Date()); obj.put("create_time", new Date());
obj.put("status", 0); obj.put("status", 0);
obj.put("order_id",orderId); obj.put("order_id", orderId);
obj.put("client_id", clientId); obj.put("client_id", clientId);
redPackLogMapper.saveLog(obj); redPackLogMapper.saveLog(obj);
} catch (RedPackException e) { } catch (RedPackException e) {
@ -269,8 +269,8 @@ public class RedpackServiceImpl implements RedpackService {
ran -= prizeType.getIntValue("weight"); ran -= prizeType.getIntValue("weight");
if (ran < 0) { if (ran < 0) {
String lock = Long.toString(System.currentTimeMillis(), 36) + RandomStringUtils.random(5, true, true); String lock = Long.toString(System.currentTimeMillis(), 36) + RandomStringUtils.random(5, true, true);
int lockedCount = actPartnerLMLogMapper.lockPrize(act_id, lock, prizeType.getString("type_id"), open_id, client_id, orderId, orderAmount.doubleValue(), int lockedCount = actPartnerLMLogMapper.lockPrize(act_id, lock, prizeType.getString("type_id"), open_id, client_id, orderId,
new Date()); orderAmount.doubleValue(), new Date());
if (lockedCount > 0) { if (lockedCount > 0) {
JSONObject invitationClient = actClientInvitationCodeMapper.getInvitationClient(act_id, client_id); JSONObject invitationClient = actClientInvitationCodeMapper.getInvitationClient(act_id, client_id);
if (invitationClient != null && invitationClient.getBoolean("auto_send")) { if (invitationClient != null && invitationClient.getBoolean("auto_send")) {
@ -301,9 +301,9 @@ public class RedpackServiceImpl implements RedpackService {
throw new RedPackException("ServerError", "Customer openid for redpack not available!"); throw new RedPackException("ServerError", "Customer openid for redpack not available!");
} }
String rpOpenId = customerRelation.getString(redpackApi.getOpenIdKey()); String rpOpenId = customerRelation.getString(redpackApi.getOpenIdKey());
wechatRedpack.setSendName(sendName).setOpenId(rpOpenId).setActName(act.getString("act_name")) wechatRedpack.setSendName(sendName).setOpenId(rpOpenId).setActName(act.getString("act_name")).setRemark("店长激励计划")
.setRemark("店长激励计划").setAmount(totalAmount).setWishing(wishing).setNotifyUrl(null); .setAmount(totalAmount).setWishing(wishing).setNotifyUrl(null);
String redPacketId = mpWechatApiProvider.getApi("Redpack").sendRedpack(wechatRedpack).getString("redpack_id"); String redPacketId = mpWechatApiProvider.getApi("Redpack").sendRedpack(wechatRedpack).getString("out_biz_no");
for (JSONObject prizeDetail : reallySend) { for (JSONObject prizeDetail : reallySend) {
prizeDetail.put("red_packet_id", redPacketId); prizeDetail.put("red_packet_id", redPacketId);
@ -389,8 +389,8 @@ public class RedpackServiceImpl implements RedpackService {
ran -= prizeType.getIntValue("weight"); ran -= prizeType.getIntValue("weight");
if (ran < 0) { if (ran < 0) {
String lock = Long.toString(System.currentTimeMillis(), 36) + RandomStringUtils.random(5, true, true); String lock = Long.toString(System.currentTimeMillis(), 36) + RandomStringUtils.random(5, true, true);
int lockedCount = actPartnerLMLogMapper.lockPrize(act_id, lock, prizeType.getString("type_id"), open_id, client_id, orderId, orderAmount.doubleValue(), int lockedCount = actPartnerLMLogMapper.lockPrize(act_id, lock, prizeType.getString("type_id"), open_id, client_id, orderId,
new Date()); orderAmount.doubleValue(), new Date());
if (lockedCount > 0) { if (lockedCount > 0) {
JSONObject invitationClient = actClientInvitationCodeMapper.getInvitationClient(act_id, client_id); JSONObject invitationClient = actClientInvitationCodeMapper.getInvitationClient(act_id, client_id);
if (invitationClient != null && invitationClient.getBoolean("auto_send")) { if (invitationClient != null && invitationClient.getBoolean("auto_send")) {
@ -412,8 +412,6 @@ public class RedpackServiceImpl implements RedpackService {
String wishing = "恭喜获得ROYALPAY店长福利红包"; String wishing = "恭喜获得ROYALPAY店长福利红包";
String notifyUrl = "https://mpay.royalpay.com.au/sys/lucky_money/partner/" + red_packet_order_id + "notify"; String notifyUrl = "https://mpay.royalpay.com.au/sys/lucky_money/partner/" + red_packet_order_id + "notify";
WechatRedpack wechatRedpack = new WechatRedpack(); WechatRedpack wechatRedpack = new WechatRedpack();
JSONObject customerRelation = customerMapper.findCustomerByOpenId(open_id); JSONObject customerRelation = customerMapper.findCustomerByOpenId(open_id);
MpWechatApi redpackApi = mpWechatApiProvider.getApi("Redpack"); MpWechatApi redpackApi = mpWechatApiProvider.getApi("Redpack");
@ -421,9 +419,9 @@ public class RedpackServiceImpl implements RedpackService {
throw new RedPackException("ServerError", "Customer openid for redpack not available!"); throw new RedPackException("ServerError", "Customer openid for redpack not available!");
} }
String rpOpenId = customerRelation.getString(redpackApi.getOpenIdKey()); String rpOpenId = customerRelation.getString(redpackApi.getOpenIdKey());
wechatRedpack.setSendName(sendName).setOpenId(rpOpenId).setActName(actName) wechatRedpack.setSendName(sendName).setOpenId(rpOpenId).setActName(actName).setRemark("店长激励计划").setAmount(luckyMoeny).setWishing(wishing)
.setRemark("店长激励计划").setAmount(luckyMoeny).setWishing(wishing).setNotifyUrl(notifyUrl); .setNotifyUrl(notifyUrl);
String redPacketId = mpWechatApiProvider.getApi("Redpack").sendRedpack(wechatRedpack).getString("redpack_id"); String redPacketId = mpWechatApiProvider.getApi("Redpack").sendRedpack(wechatRedpack).getString("out_biz_no");
prizeDetail.put("red_packet_id", redPacketId); prizeDetail.put("red_packet_id", redPacketId);
prizeDetail.put("status", 1); prizeDetail.put("status", 1);
actPartnerLMLogMapper.update(prizeDetail); actPartnerLMLogMapper.update(prizeDetail);
@ -447,9 +445,10 @@ public class RedpackServiceImpl implements RedpackService {
break; break;
} }
AlipayRedpack alipayRedpack = new AlipayRedpack(); AlipayRedpack alipayRedpack = new AlipayRedpack();
alipayRedpack.setPayeeAccount(alipayUserId).setAmount(prizeDetail.getBigDecimal("red_packet_amount")).setPayerShowName("RoyalPay福利社"). alipayRedpack.setPayeeAccount(alipayUserId).setAmount(prizeDetail.getBigDecimal("red_packet_amount")).setPayerShowName("RoyalPay福利社")
setRemark("RoyalPay店长活动-" + (rate.intValue() > 1 ? rate.intValue() + "倍" : "") + "红包奖励" + specialDocuments); .setRemark("RoyalPay店长活动-" + (rate.intValue() > 1 ? rate.intValue() + "倍" : "") + "红包奖励" + specialDocuments);
String redPacketId = mpAlipayRedpackApi.sendRedpack(alipayRedpack).getString("redpack_id"); JSONObject mpAlipayJson = mpAlipayRedpackApi.sendRedpack(alipayRedpack);
String redPacketId = mpAlipayJson.getString("out_biz_no");
prizeDetail.put("red_packet_id", redPacketId); prizeDetail.put("red_packet_id", redPacketId);
prizeDetail.put("status", 5); prizeDetail.put("status", 5);
actPartnerLMLogMapper.update(prizeDetail); actPartnerLMLogMapper.update(prizeDetail);

@ -31,9 +31,6 @@ public class RedPackTaskManager {
@Scheduled(cron = "0 0/10 * * * ?") @Scheduled(cron = "0 0/10 * * * ?")
public void updateAlipayRedPackStatus() { public void updateAlipayRedPackStatus() {
logger.info("kira---------redpack Check");
logger.debug("kira---------redpack Check");
redpackService.updateAlipayRedPacketsStatus("3"); redpackService.updateAlipayRedPacketsStatus("3");
} }

@ -37,7 +37,7 @@ public class NoticeRefundAuditListener implements ApplicationListener<NewRefundA
audition.put("client_id", clientId); audition.put("client_id", clientId);
String orderId = newRefundAuditEvent.getRefundOrder().getString("order_id"); String orderId = newRefundAuditEvent.getRefundOrder().getString("order_id");
audition.put("order_id", orderId); audition.put("order_id", orderId);
audition.put("refund_id", newRefundAuditEvent.getRefundOrder().getIntValue("refund_id")); audition.put("refund_id", newRefundAuditEvent.getRefundOrder().getString("refund_id"));
String operatorName = "anonymous"; String operatorName = "anonymous";
if (newRefundAuditEvent.getOperator() != null) { if (newRefundAuditEvent.getOperator() != null) {
audition.put("applyerid", newRefundAuditEvent.getOperator().getIntValue("operator_id")); audition.put("applyerid", newRefundAuditEvent.getOperator().getIntValue("operator_id"));

@ -244,7 +244,6 @@
</div> </div>
</div> </div>
</div> </div>
##Button(初审)
<div th:if="${applyClient.apply_approve_result==0}"> <div th:if="${applyClient.apply_approve_result==0}">
<br/> <br/>
<div class="weui_btn_area"> <div class="weui_btn_area">
@ -253,7 +252,5 @@
</div> </div>
<br/> <br/>
</div> </div>
##Button(分配BD后审批)
##待加
</body> </body>
</html> </html>

@ -269,7 +269,7 @@
<span class="icon-bar"></span> <span class="icon-bar"></span>
</button> </button>
<a class="navbar-brand" href="https://www.royalpay.com.au/"> <a class="navbar-brand" href="https://www.royalpay.com.au/">
<img src="https://www.royalpay.com.au/resources/logo@2x.svg" alt="" class="navbar--logo"> <img src="/static/images/logo.svg" alt="" class="navbar--logo" style="width: 275px;height: 32px;display: block;margin-top: 3.2%;">
</a> </a>
</div> </div>

@ -0,0 +1,255 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 17.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
width="350.375px" height="38.89px" viewBox="0 0 350.375 38.89" enable-background="new 0 0 350.375 38.89" xml:space="preserve">
<g>
<g>
<path fill="#FFFFFF" d="M14.944,22.518"/>
</g>
<path fill="#FFFFFF" d="M25.885,28.197c0-1.757-1.348-3.199-3.065-3.348l-3.931-8.43c-0.077-0.164-0.024-0.359,0.125-0.464
c1.442-1.017,2.385-2.694,2.385-4.592c0-3.096-2.508-5.608-5.603-5.613h-0.01c-0.018,0-0.035,0.001-0.052,0.001V5.751H9.436
c-0.207,0-0.374,0.167-0.374,0.374v2.619c0,0.207,0.167,0.374,0.374,0.374h6.297v0h0.01c1.218,0,2.255,0.947,2.298,2.164
c0.045,1.278-0.978,2.329-2.246,2.329H3.45V4.893c0-0.138-0.112-0.249-0.249-0.249H2.577c-1.377,0-2.494,1.117-2.494,2.494V27.48
c0,0.026,0.001,0.051,0.002,0.077c0,0.025-0.002,0.05-0.002,0.075c0,1.979,1.463,3.616,3.367,3.888
c0.183,0.026,0.37,0.04,0.561,0.04c0.191,0,0.378-0.014,0.561-0.04c1.178-0.168,2.186-0.859,2.784-1.83
c0.369-0.591,0.582-1.288,0.582-2.033v-6.179h7.794v-0.001c0.002,0,0.003,0,0.005,0c0.213,0.002,0.353-0.223,0.263-0.416
l-1.274-2.734c-0.061-0.132-0.194-0.216-0.339-0.216H4.947c-0.207,0-0.374,0.167-0.374,0.374v0l0,9.123
c0,0.293-0.215,0.555-0.507,0.582c-0.335,0.031-0.615-0.23-0.615-0.559V16.978h11.747c0.145,0,0.278,0.084,0.339,0.216l4.233,9.077
c-0.383,0.546-0.607,1.21-0.607,1.927c0,1.757,1.348,3.199,3.066,3.348l0.001,0.002l0.004-0.002
c0.096,0.009,0.192,0.014,0.291,0.014c1.139,0,2.144-0.566,2.752-1.432l0.005-0.002l-0.001-0.002
C25.661,29.576,25.885,28.913,25.885,28.197z"/>
<path fill="#FFFFFF" d="M4.573,12.126V3.771c0-1.377,1.117-2.494,2.494-2.494h8.729c5.654,0.005,10.219,4.656,10.087,10.343
c-0.074,3.129-1.594,5.91-3.903,7.712c-0.15,0.117-0.37,0.065-0.451-0.108l-1.193-2.558c-0.068-0.145-0.037-0.318,0.08-0.427
c1.279-1.201,2.089-2.889,2.114-4.771c0.049-3.76-2.985-6.824-6.734-6.824H8.256c-0.175,0-0.317,0.142-0.317,0.317v7.165
c0,0.207-0.167,0.374-0.374,0.374H4.947C4.74,12.5,4.573,12.331,4.573,12.126z"/>
<path fill="#FFFFFF" d="M44.805,14.991c-0.062-0.106-0.126-0.211-0.192-0.314c-0.415-0.572-1.09-0.945-1.851-0.945
c-1.263,0-2.287,1.024-2.287,2.286c0,0.421,0.113,0.817,0.314,1.156c0.011,0.02,0.025,0.041,0.037,0.062
c0.443,0.742,0.698,1.611,0.698,2.539c0,2.738-2.22,4.958-4.957,4.958c-2.738,0-4.958-2.22-4.958-4.958
c0-2.737,2.22-4.957,4.958-4.957c0.157,0,0.312,0.007,0.465,0.022c0.089,0.007,0.176,0.017,0.262,0.031
c0.045,0.002,0.09,0.004,0.136,0.004c1.262,0,2.286-1.024,2.286-2.287c0-1.102-0.781-2.023-1.819-2.238
c-0.001,0-0.004,0-0.006-0.001c-0.122-0.017-0.246-0.031-0.37-0.044c-0.313-0.031-0.631-0.047-0.953-0.047
c-5.264,0-9.53,4.267-9.53,9.53s4.266,9.53,9.53,9.53c5.262,0,9.53-4.267,9.53-9.53C46.098,18.038,45.627,16.4,44.805,14.991z"/>
<path fill="#FFFFFF" d="M61.211,10.471l-4.939,11.463L51.305,10.47c-0.059-0.137-0.194-0.225-0.343-0.225h-3.989
c-0.179,0-0.3,0.184-0.229,0.349l7.269,16.491h0.039l-1.106,2.567c-0.209,0.485-0.687,0.8-1.216,0.8h-2.396
c-0.207,0-0.374,0.167-0.374,0.374v3.741c0,0.207,0.167,0.374,0.374,0.374h2.633c1.935,0,3.684-1.151,4.45-2.928l9.354-21.419
c0.071-0.165-0.05-0.348-0.229-0.348h-3.989C61.405,10.245,61.27,10.334,61.211,10.471z"/>
<path fill="#FFFFFF" d="M84.264,24.823V10.581c0-0.207-0.167-0.374-0.374-0.374h-8.043c-5.293,0-9.579,4.31-9.539,9.612
c0.039,5.26,4.399,9.467,9.659,9.467h0.45c1.235,0,2.235-1.001,2.235-2.235v0c0-1.235-1.001-2.235-2.235-2.235h-0.48
c-2.796,0-5.157-2.287-5.14-5.083c0.009-1.381,0.572-2.632,1.479-3.539c0.914-0.914,2.176-1.479,3.571-1.479h3.927v11.605
c0,1.653,1.34,2.993,2.993,2.993h2.369c0.138,0,0.249-0.112,0.249-0.249v-3.99c0-0.138-0.112-0.249-0.249-0.249H84.264z"/>
<path fill="#FFFFFF" d="M84.255,24.835"/>
<path fill="#FFFFFF" d="M93.241,24.823V3.869c0-0.207-0.167-0.374-0.374-0.374h-3.741c-0.207,0-0.374,0.167-0.374,0.374v20.954
v1.495c0,1.652,1.339,2.992,2.991,2.993l2.247,0.002c0.207,0,0.374-0.167,0.374-0.374v-3.741c0-0.207-0.167-0.374-0.374-0.374
H93.241z"/>
<path fill="#FFFFFF" d="M97.75,6.118v22.82c0,0.207,0.167,0.374,0.374,0.374h3.741c0.207,0,0.374-0.167,0.374-0.374V10.669
c0-0.207,0.167-0.374,0.374-0.374h6.978c2.135,0,3.866,1.731,3.866,3.866v0c0,2.135-1.731,3.866-3.866,3.866h-2.837
c-1.257,0-2.276,1.019-2.276,2.276v0c0,1.257,1.019,2.276,2.276,2.276h2.775c4.649,0,8.417-3.769,8.417-8.417v0
c0-4.649-3.769-8.417-8.417-8.417H98.124C97.917,5.744,97.75,5.911,97.75,6.118z"/>
<path fill="#FFFFFF" d="M138.14,24.823V10.581c0-0.207-0.167-0.374-0.374-0.374h-8.043c-5.293,0-9.579,4.31-9.539,9.612
c0.039,5.26,4.399,9.467,9.659,9.467h0.45c1.235,0,2.235-1.001,2.235-2.235v0c0-1.235-1.001-2.235-2.235-2.235h-0.48
c-2.796,0-5.157-2.287-5.14-5.083c0.009-1.381,0.572-2.632,1.479-3.539c0.914-0.914,2.176-1.479,3.571-1.479h3.927v11.605
c0,1.653,1.34,2.993,2.993,2.993h2.369c0.138,0,0.249-0.112,0.249-0.249v-3.99c0-0.138-0.112-0.249-0.249-0.249H138.14z"/>
<path fill="#FFFFFF" d="M157.122,10.452l-4.939,11.463l-4.966-11.464c-0.059-0.137-0.194-0.225-0.343-0.225h-3.989
c-0.179,0-0.3,0.184-0.229,0.349l7.269,16.491h0.039l-1.106,2.567c-0.209,0.485-0.687,0.8-1.216,0.8h-2.396
c-0.207,0-0.374,0.167-0.374,0.374v3.741c0,0.207,0.167,0.374,0.374,0.374h2.633c1.935,0,3.684-1.151,4.45-2.928l9.354-21.419
c0.071-0.165-0.05-0.348-0.229-0.348h-3.989C157.316,10.226,157.181,10.315,157.122,10.452z"/>
</g>
<rect x="170" y="0" fill="#FFFFFF" width="1.75" height="38.667"/>
<path fill="#1FB922" d="M219.063,31.478c0,3.85-3.121,6.971-6.971,6.971h-24.165c-3.85,0-6.971-3.121-6.971-6.971V7.313
c0-3.85,3.121-6.971,6.971-6.971h24.165c3.85,0,6.971,3.121,6.971,6.971V31.478z"/>
<path id="XMLID_1_" fill="#FFFFFF" d="M196.84,22.354c-0.109,0.057-0.234,0.091-0.366,0.091c-0.303,0-0.569-0.175-0.707-0.431
l-0.054-0.121l-2.218-5.05c-0.024-0.055-0.039-0.118-0.039-0.178c0-0.232,0.182-0.421,0.406-0.421c0.091,0,0.175,0.031,0.243,0.083
l2.619,1.934c0.192,0.131,0.419,0.206,0.665,0.206c0.147,0,0.287-0.027,0.417-0.077l12.316-5.686
c-2.207-2.699-5.843-4.463-9.957-4.463c-6.733,0-12.191,4.718-12.191,10.538c0,3.174,1.642,6.032,4.212,7.964
c0.206,0.153,0.342,0.403,0.342,0.686c0,0.094-0.02,0.179-0.044,0.269c-0.205,0.794-0.533,2.066-0.549,2.126
c-0.025,0.099-0.065,0.203-0.065,0.308c0,0.232,0.182,0.421,0.406,0.421c0.088,0,0.161-0.033,0.235-0.078l2.669-1.598
c0.201-0.121,0.413-0.194,0.647-0.194c0.124,0,0.245,0.02,0.358,0.056c1.246,0.371,2.588,0.578,3.98,0.578
c6.732,0,12.189-4.718,12.189-10.537c0-1.763-0.503-3.423-1.388-4.884L196.929,22.3L196.84,22.354z"/>
<path fill="#FFFFFF" d="M265.222,31.343c0.013,3.241-3.079,6.747-6.89,6.747h-23.923c-3.811,0-6.901-3.046-6.901-6.803V7.702
c0-3.757,3.09-6.803,6.901-6.803h23.923c3.811,0,6.901,3.046,6.901,6.803L265.222,31.343z"/>
<path fill-rule="evenodd" clip-rule="evenodd" fill="#1DABEB" d="M237.702,29.795c-5.56,0-6.442-3.516-6.151-4.989
c0.3-1.453,1.903-3.366,4.999-3.366c3.557,0,6.742,0.912,10.559,2.775C244.425,27.711,241.128,29.795,237.702,29.795L237.702,29.795
z M265.232,26.428V7.685c0-4.047-3.276-7.323-7.323-7.323h-23.423c-4.047,0-7.323,3.276-7.323,7.323v23.422
c0,4.047,3.276,7.323,7.323,7.323h23.423c3.606,0,6.602-2.605,7.213-6.031c-1.943-0.831-10.359-4.468-14.737-6.562
c-3.336,4.037-6.833,6.461-12.102,6.461c-5.26,0-8.776-3.235-8.355-7.213c0.28-2.605,2.064-6.863,9.828-6.131
c4.087,0.381,5.961,1.152,9.297,2.254c0.862-1.583,1.583-3.326,2.124-5.179H236.39v-1.473h7.313v-2.625h-8.926v-1.613h8.926V6.522
c0,0,0.08-0.601,0.742-0.601h3.657v4.398h9.517v1.613h-9.517v2.625h7.764c-0.711,2.905-1.793,5.58-3.156,7.915
C254.963,23.283,265.232,26.428,265.232,26.428L265.232,26.428z"/>
<path fill="#FFFFFF" d="M311.355,31.478c0,3.85-3.121,6.971-6.971,6.971H280.22c-3.85,0-6.971-3.121-6.971-6.971V7.314
c0-3.85,3.121-6.971,6.971-6.971h24.165c3.85,0,6.971,3.121,6.971,6.971V31.478z"/>
<g>
<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="279.1331" y1="19.4865" x2="279.1331" y2="18.868">
<stop offset="0" style="stop-color:#E63556"/>
<stop offset="1" style="stop-color:#EA5253"/>
</linearGradient>
<polygon fill-rule="evenodd" clip-rule="evenodd" fill="url(#SVGID_1_)" points="280.294,18.868 278.069,18.868 277.972,19.486
280.199,19.486 "/>
<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="280.8648" y1="22.0145" x2="280.8648" y2="21.4092">
<stop offset="0" style="stop-color:#E63556"/>
<stop offset="1" style="stop-color:#EA5253"/>
</linearGradient>
<polygon fill-rule="evenodd" clip-rule="evenodd" fill="url(#SVGID_2_)" points="279.477,22.015 282.152,22.015 282.252,21.409
279.58,21.409 "/>
<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="279.3183" y1="18.3395" x2="279.3183" y2="17.7351">
<stop offset="0" style="stop-color:#E63556"/>
<stop offset="1" style="stop-color:#EA5253"/>
</linearGradient>
<polygon fill-rule="evenodd" clip-rule="evenodd" fill="url(#SVGID_3_)" points="280.486,17.735 278.262,17.735 278.151,18.339
280.376,18.339 "/>
<linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="290.2135" y1="23.0271" x2="290.2135" y2="21.2796">
<stop offset="0" style="stop-color:#E63556"/>
<stop offset="1" style="stop-color:#EA5253"/>
</linearGradient>
<path fill-rule="evenodd" clip-rule="evenodd" fill="url(#SVGID_4_)" d="M289.899,21.282c-0.021-0.001-0.041-0.002-0.06-0.002
c-0.268,0-0.51,0.088-0.721,0.259c-0.212,0.173-0.341,0.386-0.377,0.628c-0.036,0.243,0.026,0.455,0.186,0.628
c0.083,0.09,0.182,0.156,0.295,0.199c0.659,0.188,1.759-0.48,2.213-0.785l0.26-0.171c-0.05-0.039-0.104-0.076-0.158-0.111
C290.647,21.327,289.899,21.282,289.899,21.282z"/>
<linearGradient id="SVGID_5_" gradientUnits="userSpaceOnUse" x1="283.1852" y1="19.4374" x2="283.1852" y2="18.868">
<stop offset="0" style="stop-color:#E63556"/>
<stop offset="1" style="stop-color:#EA5253"/>
</linearGradient>
<polygon fill-rule="evenodd" clip-rule="evenodd" fill="url(#SVGID_5_)" points="284.289,18.868 282.171,18.868 282.082,19.437
284.2,19.437 "/>
<linearGradient id="SVGID_6_" gradientUnits="userSpaceOnUse" x1="283.3669" y1="18.3395" x2="283.3669" y2="17.7351">
<stop offset="0" style="stop-color:#E63556"/>
<stop offset="1" style="stop-color:#EA5253"/>
</linearGradient>
<polygon fill-rule="evenodd" clip-rule="evenodd" fill="url(#SVGID_6_)" points="284.482,17.735 282.363,17.735 282.252,18.339
284.371,18.339 "/>
<linearGradient id="SVGID_7_" gradientUnits="userSpaceOnUse" x1="304.0931" y1="19.8396" x2="304.0931" y2="19.8364">
<stop offset="0" style="stop-color:#E63556"/>
<stop offset="1" style="stop-color:#EA5253"/>
</linearGradient>
<polygon fill-rule="evenodd" clip-rule="evenodd" fill="url(#SVGID_7_)" points="304.091,19.839 304.097,19.836 304.089,19.84 "/>
<linearGradient id="SVGID_8_" gradientUnits="userSpaceOnUse" x1="304.3308" y1="19.6981" x2="304.3308" y2="19.696">
<stop offset="0" style="stop-color:#E63556"/>
<stop offset="1" style="stop-color:#EA5253"/>
</linearGradient>
<polygon fill-rule="evenodd" clip-rule="evenodd" fill="url(#SVGID_8_)" points="304.331,19.697 304.332,19.696 304.33,19.698 "/>
<linearGradient id="SVGID_9_" gradientUnits="userSpaceOnUse" x1="302.5336" y1="20.5917" x2="302.5336" y2="17.9633">
<stop offset="0" style="stop-color:#E63556"/>
<stop offset="1" style="stop-color:#EA5253"/>
</linearGradient>
<path fill-rule="evenodd" clip-rule="evenodd" fill="url(#SVGID_9_)" d="M303.225,17.963c-0.85,0.266-1.332,0.932-1.381,1.839
c-0.015,0.285,0.041,0.55,0.144,0.789c-0.103-0.239-0.158-0.505-0.143-0.789C301.894,18.896,302.375,18.23,303.225,17.963z"/>
<linearGradient id="SVGID_10_" gradientUnits="userSpaceOnUse" x1="292.3019" y1="38.4701" x2="292.3019" y2="0.3216">
<stop offset="0" style="stop-color:#E63556"/>
<stop offset="1" style="stop-color:#EA5253"/>
</linearGradient>
<path fill-rule="evenodd" clip-rule="evenodd" fill="url(#SVGID_10_)" d="M305.569,0.322h-26.533c-3.207,0-5.808,2.6-5.808,5.808
v26.533c0,3.208,2.6,5.808,5.808,5.808h26.533c3.207,0,5.808-2.6,5.808-5.808V6.129C311.376,2.922,308.776,0.322,305.569,0.322z
M299.159,17.087c0.707-0.458,1.296-1.352,1.75-2.661h1.377c-0.512,1.64-1.235,2.891-2.149,3.719l-0.221,0.2h0.665
c-0.003,0.002-0.006,0.002-0.008,0.003c0,0,0.55-0.053,0.47,0.667l-0.566,3.721c-0.526,0.1-1.181,0.09-1.528,0.075l0.631-4.143
l-0.69,0.26L299.159,17.087z M276.513,14.489h3.207c1.349,0,1.532,0.436,1.402,1.31l-0.167,0.78
c0.764,0.027,1.89-0.327,2.042-0.844h-1.164l0.107-0.425h2.568c-0.11,1.493-2.77,2.292-5.148,1.267l-0.1-0.02l0.004-0.022
l0.142-0.94c0.102-0.47-0.08-0.687-0.545-0.655h-2.448L276.513,14.489z M286.497,17.185l-0.508,2.802h-10.08l0.51-2.802H286.497z
M277.579,15.735h-1.163l0.107-0.425h2.567c-0.111,1.513-2.535,2.142-4.488,1.001C275.412,16.467,277.308,16.486,277.579,15.735z
M286.428,24.344c0,0-3.852,0.667-4.345-1.614h-2.807c-0.386,0.617-1.27,1.02-2.159,1.237c-0.052,0.015-0.101,0.026-0.15,0.04
c-1.606,0.345-2.407-0.218-2.407-0.218l0.078-0.278c0.171,0.035,0.333,0.058,0.486,0.071c0.011,0.001,0.022,0.001,0.034,0.003
c1.331,0.092,1.982-0.641,2.118-0.816c0.009-0.013,0.02-0.024,0.028-0.039h-2.41l0.106-0.715h2.527l0.104-0.605h-2.21l0.103-0.717
h2.23l0.065-0.398h1.951l-0.069,0.398h2.672l0.067-0.398h2.032l-0.067,0.398h1.885l-0.104,0.717h-1.899l-0.102,0.605h2.343
l-0.105,0.715h-2.349C284.132,23.721,286.428,24.344,286.428,24.344z M286.762,15.747l-0.247,1.138h-1.845l0.277-1.339
c0.064-0.436-0.102-0.654-0.497-0.654h-2.534l0.099-0.453h3.385C286.779,14.473,286.887,15.053,286.762,15.747z M309.19,16.777
h-0.746l-1.015,6.664c-0.041,0.228-0.153,0.435-0.337,0.63c-0.22,0.213-0.465,0.316-0.75,0.316h-1.756c0,0,0.195-0.998,0.896-1.185
c0.161-0.014,0.29-0.067,0.378-0.159c0.088-0.093,0.144-0.21,0.164-0.345l0.391-2.565c-0.021,0.044-0.042,0.088-0.065,0.133
c-0.188,0.374-0.402,0.693-0.663,0.954c-1.215,2.081-5.249,2.935-7.281,3.091c-3.377,0.171-5.278-1.137-5.572-1.358l-0.041-0.032
c-2.625,2.14-4.231,1.473-4.828,1.055c-0.06-0.04-0.114-0.082-0.164-0.127c-0.068-0.059-0.102-0.098-0.102-0.098
c-0.004-0.006-0.007-0.013-0.011-0.019c-0.054-0.066-0.101-0.135-0.137-0.21c-0.304-0.617-0.291-1.317,0.034-2.072
c0.382-0.737,0.952-1.181,1.75-1.354c0.291-0.075,0.587-0.113,0.88-0.113c0.285,0,0.574,0.037,0.862,0.109
c1.137,0.261,1.983,0.951,1.983,0.951l2.404-1.711h-7.603l0.18-1.169h4.123l0.121-0.79c0.067-0.44-0.034-0.964-0.893-0.964h-3.214
l0.178-1.169h4.254l0.128-0.845h1.506l-0.128,0.845h4.599l-0.577,1.169h-4.2l-0.266,1.754h3.625
c0.116,0.014,0.253,0.055,0.349,0.159c0.003,0.005,0.007,0.01,0.01,0.015c0.007,0.008,0.013,0.016,0.02,0.024
c0.008,0.013,0.016,0.025,0.025,0.038c0.006,0.01,0.011,0.02,0.017,0.032c0.09,0.179,0.088,0.416-0.004,0.714
c-0.068,0.173-0.187,0.3-0.276,0.376l-3.359,2.456l0.127,0.088c0.184,0.127,0.394,0.241,0.621,0.344h-0.001
c0,0,0.17,0.087,0.504,0.199c0.051,0.018,0.103,0.034,0.154,0.05c0.02,0.006,0.041,0.013,0.061,0.019
c0.146,0.044,0.298,0.085,0.458,0.122c0.005,0.002,0.008,0.002,0.012,0.004c0.06,0.013,0.12,0.027,0.182,0.04
c1.209,0.263,3.206,0.453,5.946-0.085c1.265-0.222,2.483-0.595,3.228-1.266c-0.02,0.014-0.04,0.029-0.06,0.042
c-0.495,0.337-1.267,0.538-2.181,0.172c-0.027-0.011-0.054-0.023-0.081-0.035c0,0-0.004-0.002-0.006-0.003
c-0.016-0.007-0.032-0.015-0.047-0.022c-0.006-0.003-0.012-0.006-0.018-0.009c-0.094-0.046-0.185-0.1-0.271-0.161
c-0.518-0.339-0.978-0.991-0.936-1.763c0.051-0.935,0.675-1.594,1.495-1.82c0.186-0.052,0.366-0.076,0.536-0.076
c0.376,0,0.705,0.117,0.962,0.301c0.34,0.191,0.585,0.491,0.686,0.824c0.305,0.995-0.623,1.774-1.459,1.664
c-0.017-0.002-0.032-0.005-0.049-0.008c-0.015-0.001-0.031-0.003-0.046-0.004c-0.284-0.034-0.667-0.233-0.823-0.52l-0.001-0.002
c-0.013-0.02-0.027-0.039-0.037-0.061c-0.319-0.58,0.062-1.045,0.062-1.045c-0.001,0.003-0.001,0.006-0.001,0.006l0.001-0.002
c-0.065,0.211-0.004,0.433,0.127,0.606c0.157,0.182,0.415,0.279,0.703,0.201c0.421-0.112,0.591-0.443,0.549-0.76
c-0.095-0.351-0.434-0.651-1.067-0.527c-0.639,0.128-1.062,0.752-1.043,1.256c0.023,0.639,0.35,1.024,0.636,1.2
c0.165,0.102,0.35,0.172,0.539,0.214c0.433,0.046,0.869-0.088,1.183-0.309c0.156-0.111,0.294-0.241,0.414-0.386
c0.24-0.288,0.392-0.638,0.586-0.958c0.275-0.452,0.606-0.684,0.909-0.798l0.088-0.579c0.136-0.885-0.258-1.352-1.137-1.352h-3.075
l0.196-1.29h4.417l0.168-1.105h1.516l-0.168,1.105h1.216L309.19,16.777z"/>
<linearGradient id="SVGID_11_" gradientUnits="userSpaceOnUse" x1="303.491" y1="19.8148" x2="303.491" y2="19.7979">
<stop offset="0" style="stop-color:#E63556"/>
<stop offset="1" style="stop-color:#EA5253"/>
</linearGradient>
<path fill-rule="evenodd" clip-rule="evenodd" fill="url(#SVGID_11_)" d="M303.501,19.813c0,0,0.003,0.001,0.005,0.002
c-0.01-0.005-0.019-0.011-0.029-0.017C303.485,19.803,303.492,19.809,303.501,19.813z"/>
<linearGradient id="SVGID_12_" gradientUnits="userSpaceOnUse" x1="303.2229" y1="19.5971" x2="303.2229" y2="19.5603">
<stop offset="0" style="stop-color:#E63556"/>
<stop offset="1" style="stop-color:#EA5253"/>
</linearGradient>
<path fill-rule="evenodd" clip-rule="evenodd" fill="url(#SVGID_12_)" d="M303.238,19.597c-0.006-0.007-0.01-0.015-0.016-0.022
c-0.004-0.005-0.009-0.009-0.014-0.014C303.217,19.573,303.228,19.585,303.238,19.597z"/>
<linearGradient id="SVGID_13_" gradientUnits="userSpaceOnUse" x1="302.9365" y1="19.497" x2="302.9365" y2="19.4946">
<stop offset="0" style="stop-color:#E63556"/>
<stop offset="1" style="stop-color:#EA5253"/>
</linearGradient>
<polygon fill-rule="evenodd" clip-rule="evenodd" fill="url(#SVGID_13_)" points="302.936,19.497 302.937,19.495 302.936,19.496
"/>
</g>
<g id="XMLID_5080_">
<path id="XMLID_5077_" fill="#E2231A" d="M348.342,38.433h-27.046c-1.067,0-1.931-0.865-1.931-1.931V2.324
c0-1.067,0.865-1.931,1.931-1.931h27.032c1.074,0,1.944,0.871,1.944,1.944v34.165C350.273,37.569,349.409,38.433,348.342,38.433z"
/>
<linearGradient id="XMLID_4_" gradientUnits="userSpaceOnUse" x1="326.0263" y1="17.7883" x2="343.6125" y2="0.2021">
<stop offset="0" style="stop-color:#E5E5E4"/>
<stop offset="0.1999" style="stop-color:#D1D1D1"/>
<stop offset="0.3046" style="stop-color:#D9D9D9"/>
<stop offset="0.7446" style="stop-color:#F5F5F5"/>
<stop offset="1" style="stop-color:#FFFFFF"/>
</linearGradient>
<path id="XMLID_5076_" fill="url(#XMLID_4_)" d="M346.439,3.588h-23.24c-0.746,0-1.35,0.604-1.35,1.35v8.673h25.94V4.938
C347.789,4.193,347.185,3.588,346.439,3.588z"/>
<rect x="321.849" y="8.035" fill="#D3B464" width="25.94" height="5.576"/>
<g>
<polygon fill="#FFFFFF" points="340.485,19.531 338.12,19.531 336.313,22.813 336.315,24.519 337.476,23.13 337.476,29.731
338.97,29.731 338.97,21.343 "/>
<polygon fill="#FFFFFF" points="340.695,23.054 342.861,27.137 343.815,27.137 342.396,23.054 "/>
<polygon fill="#FFFFFF" points="330.876,26.099 333.042,29.731 333.996,29.731 332.576,26.099 "/>
<polygon fill="#FFFFFF" points="321.911,29.731 322.866,29.731 325.031,26.099 323.331,26.099 "/>
<path fill="#FFFFFF" d="M326.231,19.531h-1.684l-0.281,0.71h-2.355v0.933h1.985l-1.573,3.962h4.879v2.5
c0,0.553-0.092,0.792-0.274,0.952c-0.185,0.16-0.462,0.244-0.833,0.251v0.892c0.962-0.031,1.665-0.239,2.113-0.628
c0.446-0.388,0.671-0.984,0.671-1.782v-2.184h4.647v-0.044v-0.888h-4.647v-1.465h-1.677v1.465h-2.736l1.123-3.03h8.406v-0.933
h-8.041L326.231,19.531z"/>
<path fill="#FFFFFF" d="M348.336,20.974h-1.571v-1.444h-1.677v1.444h-5.221v0.933h5.221v5.729c0,0.553-0.092,0.792-0.274,0.952
c-0.185,0.16-0.462,0.244-0.833,0.251v0.892c0.962-0.031,1.665-0.239,2.113-0.628c0.446-0.388,0.671-0.984,0.671-1.782v-5.413
h1.571V20.974z"/>
</g>
<g id="XMLID_5046_">
<path id="XMLID_5062_" fill="#FFFFFF" d="M342.431,32.849c-0.741,0-1.345,0.604-1.345,1.347c0,0.743,0.603,1.348,1.345,1.348
c0.741,0,1.344-0.605,1.344-1.348C343.776,33.454,343.173,32.849,342.431,32.849z M342.431,35.14
c-0.519,0-0.941-0.423-0.941-0.943c0-0.52,0.422-0.943,0.941-0.943c0.519,0,0.941,0.423,0.941,0.943
C343.372,34.717,342.95,35.14,342.431,35.14z"/>
<path id="XMLID_5059_" fill="#FFFFFF" d="M326.027,33.202c-0.255-0.223-0.629-0.336-1.111-0.336h-0.569v2.676h0.569
c0.483,0,0.857-0.113,1.111-0.336c0.253-0.222,0.386-0.568,0.386-1.001C326.414,33.77,326.28,33.423,326.027,33.202z
M325.735,34.919c-0.17,0.155-0.429,0.234-0.77,0.234h-0.198v-1.897h0.198c0.341,0,0.6,0.079,0.77,0.233
c0.167,0.152,0.255,0.399,0.255,0.715C325.99,34.52,325.902,34.767,325.735,34.919z"/>
<path id="XMLID_5058_" fill="#FFFFFF" d="M322.66,34.48c0,0.176-0.012,0.3-0.035,0.369c-0.022,0.065-0.06,0.12-0.112,0.161
c-0.064,0.049-0.142,0.085-0.231,0.108c-0.088,0.022-0.197,0.034-0.325,0.035h-0.044v0.388h0.043c0.01,0,0.018,0,0.021,0
c0.371,0,0.662-0.079,0.843-0.233c0.184-0.158,0.278-0.398,0.278-0.713v-1.728h-0.435V34.48z"/>
<circle id="XMLID_5056_" fill="#FFFFFF" cx="336.703" cy="35.196" r="0.258"/>
<polygon id="XMLID_5055_" fill="#FFFFFF" points="347.026,32.927 346.109,34.647 345.191,32.927 344.767,32.927 344.767,35.499
345.17,35.499 345.17,33.76 346.109,35.456 347.048,33.76 347.048,35.499 347.452,35.499 347.452,32.927 "/>
<path id="XMLID_5054_" fill="#FFFFFF" d="M339.895,34.903c-0.172,0.152-0.392,0.236-0.621,0.236c-0.518,0-0.939-0.422-0.939-0.94
c0-0.519,0.421-0.94,0.939-0.94c0.229,0,0.45,0.084,0.622,0.236l0.031,0.027l0.284-0.285l-0.035-0.031
c-0.247-0.226-0.568-0.35-0.903-0.35c-0.739,0-1.341,0.603-1.341,1.344c0,0.741,0.601,1.344,1.341,1.344
c0.334,0,0.655-0.125,0.903-0.351l0.034-0.031l-0.284-0.284L339.895,34.903z"/>
<path id="XMLID_5051_" fill="#FFFFFF" d="M331.451,32.866l-1.022,2.671h0.441l0.266-0.695h1.071l0.266,0.695h0.441l-1.022-2.671
H331.451z M332.053,34.44h-0.764l0.382-0.998L332.053,34.44z"/>
<path id="XMLID_5048_" fill="#FFFFFF" d="M328.798,32.866h-0.745h-0.403v0.403v2.268h0.403v-0.978h0.745
c0.468,0,0.847-0.379,0.847-0.847C329.645,33.245,329.266,32.866,328.798,32.866z M328.798,34.157h-0.745v-0.888h0.745v0.002
c0.245,0,0.443,0.198,0.443,0.443C329.241,33.959,329.043,34.157,328.798,34.157z"/>
<polygon id="XMLID_5047_" fill="#FFFFFF" points="335.601,32.866 334.833,34.035 334.065,32.866 333.625,32.866 334.594,34.343
334.594,34.343 334.631,34.399 334.631,35.537 335.035,35.537 335.035,34.399 335.072,34.343 335.072,34.343 335.113,34.281
335.202,34.145 335.202,34.145 336.042,32.866 "/>
</g>
</g>
</svg>

After

Width:  |  Height:  |  Size: 22 KiB

@ -174,7 +174,6 @@ $(function () {
data.customerrate = true; data.customerrate = true;
} }
data.coupons = dataCache.coupons; data.coupons = dataCache.coupons;
data.price = data.price*100;
$.ajax({ $.ajax({
url: '/partner/cashiers/payment/'+ window.client_moniker +'/'+window.cashier_id+'/orders/', url: '/partner/cashiers/payment/'+ window.client_moniker +'/'+window.cashier_id+'/orders/',
method: 'post', method: 'post',

Loading…
Cancel
Save