Skip to content
Toggle navigation
Projects
Groups
Snippets
Help
Kunto
/
backoffice
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Settings
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit 706726ae
authored
Oct 20, 2019
by
yasir
Browse Files
Options
Browse Files
Tag
Download
Email Patches
Plain Diff
menambahkan jam
1 parent
06a62940
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
3 deletions
src/agratek/api/merchant/views/payment_list.py
src/agratek/api/merchant/views/purchase_list.py
src/agratek/api/merchant/views/payment_list.py
View file @
706726a
...
@@ -6,7 +6,7 @@ from opensipkd.base.views import DataTables
...
@@ -6,7 +6,7 @@ from opensipkd.base.views import DataTables
from
opensipkd.base.tools.report
import
csv_response
from
opensipkd.base.tools.report
import
csv_response
from
pyramid.httpexceptions
import
HTTPFound
from
pyramid.httpexceptions
import
HTTPFound
from
pyramid.view
import
view_config
from
pyramid.view
import
view_config
from
sqlalchemy
import
case
from
sqlalchemy
import
case
,
func
from
sqlalchemy.orm
import
aliased
from
sqlalchemy.orm
import
aliased
from
.
import
BaseView
from
.
import
BaseView
...
@@ -223,7 +223,8 @@ class ViewData(BaseView):
...
@@ -223,7 +223,8 @@ class ViewData(BaseView):
columns
=
[
columns
=
[
ColumnDT
(
PartnerPay
.
id
,
mData
=
'id'
),
ColumnDT
(
PartnerPay
.
id
,
mData
=
'id'
),
ColumnDT
(
PartnerPay
.
cust_inv_no
,
mData
=
'nomor'
),
ColumnDT
(
PartnerPay
.
cust_inv_no
,
mData
=
'nomor'
),
ColumnDT
(
PartnerPay
.
created
,
mData
=
'created'
),
# ColumnDT(PartnerPay.created, mData = 'created'),
ColumnDT
(
func
.
to_char
(
PartnerPay
.
created
,
'dd-mm-yyyy HH24:MI'
),
mData
=
'created'
),
ColumnDT
(
ColumnDT
(
column_concat
([
column_concat
([
PartnerPay
.
inv_cust_nm
,
PartnerPay
.
inv_cust_nm
,
...
...
src/agratek/api/merchant/views/purchase_list.py
View file @
706726a
...
@@ -12,6 +12,7 @@ from . import BaseView
...
@@ -12,6 +12,7 @@ from . import BaseView
from
..models
import
(
DBSession
,
H2hArInvoice
,
H2hArInvoiceDet
,
Partner
,
Produk
)
from
..models
import
(
DBSession
,
H2hArInvoice
,
H2hArInvoiceDet
,
Partner
,
Produk
)
from
opensipkd.base.tools
import
format_json
from
opensipkd.base.tools
import
format_json
from
datetime
import
datetime
from
datetime
import
datetime
from
sqlalchemy
import
cast
,
Time
,
String
,
func
,
Date
status_purchase
=
(
status_purchase
=
(
(
9999
,
'--Semua--'
),
(
9999
,
'--Semua--'
),
...
@@ -170,7 +171,8 @@ class ViewData(BaseView):
...
@@ -170,7 +171,8 @@ class ViewData(BaseView):
columns
=
[
columns
=
[
ColumnDT
(
H2hArInvoiceDet
.
id
,
mData
=
'id'
),
ColumnDT
(
H2hArInvoiceDet
.
id
,
mData
=
'id'
),
ColumnDT
(
H2hArInvoice
.
cust_inv_no
,
mData
=
'nomor'
),
ColumnDT
(
H2hArInvoice
.
cust_inv_no
,
mData
=
'nomor'
),
ColumnDT
(
H2hArInvoice
.
created
,
mData
=
'created'
),
# ColumnDT(func.concat_ws(' ', func.to_char(cast(H2hArInvoice.created, Date), ), func.left(cast(cast(H2hArInvoice.created, Time), String), 5)), mData = 'created'),
ColumnDT
(
func
.
to_char
(
H2hArInvoice
.
created
,
'dd-mm-yyyy HH24:MI'
),
mData
=
'created'
),
ColumnDT
(
H2hArInvoiceDet
.
id_pel
,
mData
=
'id_pel'
),
ColumnDT
(
H2hArInvoiceDet
.
id_pel
,
mData
=
'id_pel'
),
ColumnDT
(
customer
.
nama
,
mData
=
'customer'
),
ColumnDT
(
customer
.
nama
,
mData
=
'customer'
),
ColumnDT
(
vendor
.
nama
,
mData
=
'vendor'
),
ColumnDT
(
vendor
.
nama
,
mData
=
'vendor'
),
...
...
Write
Preview
Markdown
is supported
Attach a file
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 post a comment