브렌치:
feature/1602-approachOrder
bugfix/0805
bugfix/1944-store-num
bugfix/2035-remain-not-minus
bugfix/2047-memberLevel
bugfix/2107-transaction-self
bugfix/2567-productNotice
bugfix/EK-0416
bugfix/EK-0506
bugfix/EK-0523
bugfix/EK-1022
bugfix/EK-1345
bugfix/EK-1360
bugfix/EK-1569
bugfix/atlas-level
bugfix/bonus-0308
bugfix/goods-add-edit
bugfix/order-standard-price
bugfix/period-and-timezone
bugfix/remainpv-not-negative
bugfix/repairBonus
bugfix/standard-price
bugfix/transaction-self
bugfix/withdraw-periodnum
bugfixed/bus_calc_server_fix
bugfixed/calc_server_db_connection
bugfixed/paystack-calcbonus
dev
dev-ngds
develop
feature/1252-PayStack
feature/1359-BonusTravelCarHouse
feature/1365-i18n-international
feature/1443-dd-userUpgrade
feature/1450-theo-pickup
feature/1451-kevin-exportOrderPDF
feature/1453-kevin-bonusTravelCarHouseAwards
feature/1455-theo-admin-menu
feature/1494-kevin-BiWeeklySettlement
feature/1540-theo-auto-mesure-up
feature/1545-theo-addressModify
feature/1548-JXBonusStarDirector
feature/1550-CancelManageTaxAndWithdrawFee
feature/1559-exchangeRate
feature/1567-changePVToBV
feature/1586-returnGoods
feature/1595-userNameGenerate-NG
feature/1600-remove-middle
feature/1602-approachOrder
feature/1608-orderTaxRate
feature/1609-memberMenuChange
feature/1624-hiddenExchangePoints
feature/1722-orderListAddData
feature/1729-splitCarVillaBonus
feature/1748-packCenterAddPayStack
feature/1751-upgradeMemberAddPayType
feature/1765-exchangeRateUpgrade
feature/1854-uploadChangeToPHP
feature/1916-orderLogistics
feature/1940-theo-lastemp
feature/1962-memberBrandAmbassador
feature/1969-member30BVRule
feature/1973-external-import-mod
feature/1988-blueStarBonusRecruitChange
feature/2025-12-26-SEND_USER_PERFORMANCE
feature/2025-auto-withdraw
feature/20251216-orderlistexport
feature/2034-brook-calcBonus
feature/2047-saveUserLevel
feature/2049-withdraw-filter
feature/2068-changeMarketPerformance
feature/2082-front-chart-sponsor
feature/2141-translate
feature/2151-translate
feature/2175-team-perf
feature/2187-transfer
feature/2189-exceptionHandle
feature/2234-withdrawal-mod
feature/2268-i18n
feature/2290-region
feature/2367-out-min
feature/2463-loginFailedNotice
feature/2509-directorBonusPGS
feature/2520-calc-log
feature/2550-calc-add-id
feature/2552-switch-5-second-pull
feature/2606-trial-calc
feature/2703-biopure-ultra-3
feature/2704-newLevelBA
feature/2732-log
feature/2806-1
feature/2838-adjustHighestEmpLv
feature/3035-joway-pay
feature/3081-exportFile
feature/3140-order-period-adjust
feature/3146-joway-4
feature/3223-reconsume-mod
feature/3286-calc
feature/3305-menuChange
feature/3357-adjustOrderPeriodNum
feature/3369-pushNoticeToAlarmService
feature/3398-stageGoodAdjust
feature/AE-0909
feature/EK-1282
feature/EK-2806
feature/EK-3238
feature/EK-3320
feature/EK-3322
feature/EK-3533
feature/EK-723
feature/EK-744
feature/EK-76
feature/EK-77
feature/EK-856
feature/EK-879
feature/EPP-change
feature/NG-14
feature/NG-14-1
feature/NG-15
feature/NG-18
feature/NG-24
feature/NG-27
feature/NG-28
feature/NG-71
feature/NG-80
feature/calc-serve-1646
feature/dd-1536-teamsSaveCapping
feature/dd-1627
feature/dd-1684-delorder
feature/dd-2159
feature/dev-frontend-ui
feature/issue-3706
feature/joway
feature/kevin-1348-splitBlueStarBonu
feature/master-back
feature/mod-import-order-excel
feature/new-backend-adaptation
feature/new-backend-adaptation-3069
feature/new-backend-adaptation-david
feature/new-backend-adaptation-joway-1
feature/new-dd-1536-teamsSaveCapping
feature/new-frontend-adaptation
feature/new-frontend-adaptation-david
feature/theo-1252-withrecharge
feature/theo-translate
feature/theo-translate-merge-1590
feature/york-1365-i18n-inpro
feature/york-1365-i18n-inpro-0613
feature/york-1365-i18n-inpro-0630
feature/york-1589-dingshi
feature/york-1590-orderkucun
feature/york-1590-orderkucun-0614
master
kevin_zhangl
d24cf97289
Merge branch 'master' into feature/1602-approachOrder
|
3 년 전 | |
|---|---|---|
| .. | ||
| bootstrap.php | 4225cc8fa7 界面多语言 | 3 년 전 |
| main.php | 4225cc8fa7 界面多语言 | 3 년 전 |
| menu.php | c30e5ebbe9 修改products manage 为Shopping Mall | 3 년 전 |
| params.php | 4225cc8fa7 界面多语言 | 3 년 전 |
| urlManagerRules.php | 6618af4ac2 支付增加webhook 支付成功页面 | 3 년 전 |