ecshop/OMS
1
0
Fork 0
mirror of https://gitee.com/ShopeX/OMS synced 2026-08-11 05:35:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

[TBID:SCRUM-7446] v8.5.0

Browse Source 
1、支持拼多多消费者付费送货上门服务信息
2、修复唯品会库存回写多规格问题
3、优化天猫加急发货逻辑
4、增加库存回写触发依据配置
5、京东余额支付包含进订单支付金额中
This commit is contained in:
chenping
2026-07-27 17:02:14 +08:00
parent b40887c9c3
commit 2367b18a64
46 changed files with 1604 additions and 423 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/ome/controller/admin/delivery.php
View File

@@ -15,7 +15,6 @@
* limitations under the License.
*/
class ome_ctl_admin_delivery extends desktop_controller{
const URGENT_LABEL_CODE = 'SOMS_URGENT_SHIP';
var $name = "发货单";
var $workground = "console_center";
@@ -30,7 +29,7 @@ class ome_ctl_admin_delivery extends desktop_controller{
);
$sub_menu = array(
0 => array('label' => app::get('base')->_('全部'), 'filter' => $baseFilter, 'optional' => false),
1 => array('label' => app::get('base')->_('加急发货'), 'filter' => array_merge($baseFilter, array('delivery_label_code' => self::URGENT_LABEL_CODE)), 'optional' => false),
1 => array('label' => app::get('base')->_('加急发货'), 'filter' => array_merge($baseFilter, array('delivery_label_code' => 'SOMS_URGENT_SHIP')), 'optional' => false),
);
foreach ($sub_menu as $k => $v) {
$sub_menu[$k]['filter'] = $v['filter'];