Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
F
fmPOS
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
xiaojing.zhang
fmPOS
Commits
2c3c4fcf
Commit
2c3c4fcf
authored
Nov 06, 2017
by
gujin.wang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1.修改插件的实现方式 2.修改卡券核销时,商品券所对应的商品数量 3.修复一些崩溃的bug。
parent
780286d3
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
8 additions
and
6 deletions
+8
-6
debug/bins/FreemudPOS.ini
+2
-1
fmp_epay
+1
-1
fmp_printer
+1
-1
fmp_redeem/fmp_redeem.cpp
+2
-1
fmp_settings
+1
-1
fmp_vip
+1
-1
No files found.
debug/bins/FreemudPOS.ini
View file @
2c3c4fcf
...
@@ -26,7 +26,8 @@ Server=https://115.159.18.100/api
...
@@ -26,7 +26,8 @@ Server=https://115.159.18.100/api
Timeout
=
60
Timeout
=
60
[Vip]
[Vip]
Server
=
http://member.freemudorder.com/member_today/service/restful/pos
Server
=
http://micro-service.sandload.cn/member-pos/pos/member
NeedSocketHeader
=
0
[Syncer]
[Syncer]
Interval
=
3
Interval
=
3
...
...
fmp_epay
@
c906f78f
Subproject commit
96735c51448644c6ac421c3ccb8e022a8fbf4997
Subproject commit
c906f78fc514242334884d77169adce689e09019
fmp_printer
@
e37e6d3a
Subproject commit
4594503af57e9d86b8c64d2f1e0eb4ea87d174fd
Subproject commit
e37e6d3a169bbbac23d7fe329c7c103f4a72cb41
fmp_redeem/fmp_redeem.cpp
View file @
2c3c4fcf
...
@@ -287,7 +287,8 @@ QJsonObject FMPRedeem::ShowForUnConsum(QJsonObject json)
...
@@ -287,7 +287,8 @@ QJsonObject FMPRedeem::ShowForUnConsum(QJsonObject json)
QJsonObject
product
;
QJsonObject
product
;
product
.
insert
(
"seq"
,
1
);
product
.
insert
(
"seq"
,
1
);
product
.
insert
(
"pid"
,
_products_info
[
i
].
toObject
()[
"pid"
]);
product
.
insert
(
"pid"
,
_products_info
[
i
].
toObject
()[
"pid"
]);
product
.
insert
(
"consume_num"
,
_products_info
[
i
].
toObject
()[
"consume_num"
]);
//product.insert("consume_num", _products_info[i].toObject()["consume_num"]);
product
.
insert
(
"consume_num"
,
1
);
products
.
append
(
product
);
products
.
append
(
product
);
transaction
[
"products"
]
=
products
;
transaction
[
"products"
]
=
products
;
...
...
fmp_settings
@
38f4b78f
Subproject commit
bcada99bce3ac14fae00749e493ee4a2cdf8913c
Subproject commit
38f4b78ff630542e8b7b8abc35aa827317928664
fmp_vip
@
609da0c9
Subproject commit
1896782c508ec9cea2a38f0e02cc6dc4a3702835
Subproject commit
609da0c94281b573a41c2a277803549784bf60d4
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment