tanshu
/
barker
1
0
Fork 0
Code Issues 1 Pull Requests Releases 4 Activity

Product Sale Module done (Sales Detail) -- need to rename the permission

This commit is contained in:
Amritanshu 2019-08-21 09:27:19 +05:30
parent 241568622e
commit 0f00d96dc9
19 changed files with 528 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
barker/routes.py
View File

@ -362,6 +362,7 @@ def includeme(config):
config.add_route("v1_sa_tax", "/v1/sale-analysis/tax")
config.add_route("v1_sale_analysis", "/v1/sale-analysis")
config.add_route("v1_product_sale_report", "/v1/product-sale-report")
# Done till here
config.add_route("customer", "/Customer.json")

88
barker/views/reports/product_sale_report.py Normal file
View File

@ -0,0 +1,88 @@
from datetime import datetime, timedelta
from pyramid.view import view_config
from sqlalchemy import func
from barker.models import (
Inventory,
Kot,
Product,
Voucher,
SaleCategory,
VoucherType,
MenuCategory,
)
from barker.models.validation_exception import ValidationError
from barker.views.reports import get_start_date, get_finish_date
@view_config(
request_method="GET",
route_name="v1_product_sale_report",
renderer="json",
permission="Sales Detail",
)
def product_sale_report_view(request):
start_date = get_start_date(request.GET.get("s", None))
finish_date = get_finish_date(request.GET.get("f", None))
if (
datetime.today() - start_date.replace(hour=0)
).days > 5 and "Accounts Audit" not in request.effective_principals:
raise ValidationError("Accounts Audit")
return {
"startDate": start_date.date().strftime("%d-%b-%Y"),
"finishDate": (finish_date - timedelta(days=1)).date().strftime("%d-%b-%Y"),
"amounts": product_sale_report(start_date, finish_date, request.dbsession),
}
def product_sale_report(start_date, finish_date, dbsession):
list_ = (
dbsession.query(
Product.id,
Product.full_name,
Voucher.voucher_type,
Inventory.is_happy_hour,
func.sum(Inventory.quantity),
)
.join(Inventory.kot)
.join(Kot.voucher)
.join(Inventory.product)
.join(Product.sale_category)
.join(Product.menu_category)
.filter(Voucher.date >= start_date, Voucher.date <= finish_date)
.group_by(
SaleCategory.name,
MenuCategory.name,
Product.id,
Product.full_name,
Voucher.voucher_type,
Inventory.is_happy_hour,
)
.order_by(SaleCategory.name, MenuCategory.name)
.all()
)
info = []
for id_, name, type_, hh, quantity in list_:
type_ = to_camel_case(VoucherType(type_).name)
old = [i for i in info if i["id"] == id_ and i["isHappyHour"] == hh]
if len(old):
old[0][type_] = quantity
else:
info.append(
{
"id": id_,
"name": "H H " + name if hh else name,
"isHappyHour": hh,
type_: quantity,
}
)
return info
def to_camel_case(snake_str):
components = snake_str.split("_")
# We capitalize the first letter of each component except the first one
# with the 'title' method and join them together.
return components[0].lower() + "".join(x.title() for x in components[1:])

4
bookie/src/app/app-routing.module.ts
View File

@ -33,6 +33,10 @@ const routes: Routes = [
path: 'products',
loadChildren: () => import('./product/products.module').then(mod => mod.ProductsModule)
},
{
path: 'product-sale-report',
loadChildren: () => import('./product-sale-report/product-sale-report.module').then(mod => mod.ProductSaleReportModule)
},
{
path: 'menu-categories',
loadChildren: () => import('./menu-category/menu-categories.module').then(mod => mod.MenuCategoriesModule)

3
bookie/src/app/home/home.component.html
View File

@ -20,6 +20,9 @@
<mat-card fxLayout="column" class="square-button" matRipple *ngIf="auth.hasPermission('Tax Analysis')" [routerLink]="['/', 'tax-analysis']">
<h3 class="item-name">Tax Analysis</h3>
</mat-card>
<mat-card fxLayout="column" class="square-button" matRipple *ngIf="auth.hasPermission('Sales Detail')" [routerLink]="['/', 'product-sale-report']">
<h3 class="item-name">Product Sale Report</h3>
</mat-card>
<mat-card fxLayout="column" class="square-button" matRipple *ngIf="auth.hasPermission('Tables')" [routerLink]="['/', 'tables']">
<h3 class="item-name">Tables</h3>
</mat-card>

18
bookie/src/app/product-sale-report/product-sale-report-datasource.ts Normal file
View File

@ -0,0 +1,18 @@
import { DataSource } from '@angular/cdk/collections';
import { Observable, of as observableOf } from 'rxjs';
import { ProductSaleReportItem } from './product-sale-report';
export class ProductSaleReportDataSource extends DataSource<ProductSaleReportItem> {
constructor(public data: ProductSaleReportItem[]) {
super();
}
connect(): Observable<ProductSaleReportItem[]> {
return observableOf(this.data);
}
disconnect() {
}
}

15
bookie/src/app/product-sale-report/product-sale-report-resolver.service.spec.ts Normal file
View File

@ -0,0 +1,15 @@
import {inject, TestBed} from '@angular/core/testing';
import {ProductSaleReportResolver} from './product-sale-report-resolver.service';
describe('ProductSaleReportResolver', () => {
beforeEach(() => {
TestBed.configureTestingModule({
providers: [ProductSaleReportResolver]
});
});
it('should be created', inject([ProductSaleReportResolver], (service: ProductSaleReportResolver) => {
expect(service).toBeTruthy();
}));
});

20
bookie/src/app/product-sale-report/product-sale-report-resolver.service.ts Normal file
View File

@ -0,0 +1,20 @@
import {Injectable} from '@angular/core';
import {ActivatedRouteSnapshot, Resolve, RouterStateSnapshot} from '@angular/router';
import {Observable} from 'rxjs/internal/Observable';
import {ProductSaleReport} from './product-sale-report';
import {ProductSaleReportService} from './product-sale-report.service';
@Injectable({
providedIn: 'root'
})
export class ProductSaleReportResolver implements Resolve<ProductSaleReport> {
constructor(private ser: ProductSaleReportService) {
}
resolve(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<ProductSaleReport> {
const startDate = route.queryParamMap.get('startDate') || null;
const finishDate = route.queryParamMap.get('finishDate') || null;
return this.ser.get(startDate, finishDate);
}
}

13
bookie/src/app/product-sale-report/product-sale-report-routing.module.spec.ts Normal file
View File

@ -0,0 +1,13 @@
import {ProductSaleReportRoutingModule} from './product-sale-report-routing.module';
describe('ProductSaleReportRoutingModule', () => {
let productSaleReportRoutingModule: ProductSaleReportRoutingModule;
beforeEach(() => {
productSaleReportRoutingModule = new ProductSaleReportRoutingModule();
});
it('should create an instance', () => {
expect(productSaleReportRoutingModule).toBeTruthy();
});
});

37
bookie/src/app/product-sale-report/product-sale-report-routing.module.ts Normal file
View File

@ -0,0 +1,37 @@
import { NgModule } from '@angular/core';
import { CommonModule } from '@angular/common';
import { RouterModule, Routes } from '@angular/router';
import { ProductSaleReportResolver } from './product-sale-report-resolver.service';
import { AuthGuard } from '../auth/auth-guard.service';
import { ProductSaleReportComponent } from './product-sale-report.component';
const ProductSaleReportRoutes: Routes = [
{
path: '',
component: ProductSaleReportComponent,
canActivate: [AuthGuard],
data: {
permission: 'Sales Detail' // rename to Product Sale Report
},
resolve: {
info: ProductSaleReportResolver
},
runGuardsAndResolvers: 'always'
}
];
@NgModule({
imports: [
CommonModule,
RouterModule.forChild(ProductSaleReportRoutes)
],
exports: [
RouterModule
],
providers: [
ProductSaleReportResolver
]
})
export class ProductSaleReportRoutingModule {
}

4
bookie/src/app/product-sale-report/product-sale-report.component.css Normal file
View File

@ -0,0 +1,4 @@
.right {
display: flex;
justify-content: flex-end;
}

69
bookie/src/app/product-sale-report/product-sale-report.component.html Normal file
View File

@ -0,0 +1,69 @@
<mat-card>
<mat-card-title-group>
<mat-card-title>Product Sale Report</mat-card-title>
<button mat-button mat-icon-button (click)="exportCsv()">
<mat-icon>save_alt</mat-icon>
</button>
</mat-card-title-group>
<mat-card-content>
<form [formGroup]="form" fxLayout="column">
<div fxLayout="row" fxLayout.lt-md="column" fxLayoutGap="20px" fxLayoutGap.lt-md="0px"
fxLayoutAlign="space-around start">
<mat-form-field fxFlex="40">
<input matInput [matDatepicker]="startDate" (focus)="startDate.open()" placeholder="Start Date"
formControlName="startDate" autocomplete="off">
<mat-datepicker-toggle matSuffix [for]="startDate"></mat-datepicker-toggle>
<mat-datepicker #startDate></mat-datepicker>
</mat-form-field>
<mat-form-field fxFlex="40">
<input matInput [matDatepicker]="finishDate" (focus)="finishDate.open()" placeholder="Finish Date"
formControlName="finishDate" autocomplete="off">
<mat-datepicker-toggle matSuffix [for]="finishDate"></mat-datepicker-toggle>
<mat-datepicker #finishDate></mat-datepicker>
</mat-form-field>
<button fxFlex="20" mat-raised-button color="primary" (click)="show()">Show</button>
</div>
</form>
<mat-table #table [dataSource]="dataSource" aria-label="Elements">
<!-- Name Column -->
<ng-container matColumnDef="name">
<mat-header-cell *matHeaderCellDef>Name</mat-header-cell>
<mat-cell *matCellDef="let row">{{row.name}}</mat-cell>
</ng-container>
<!-- Unbilled Column -->
<ng-container matColumnDef="unbilled">
<mat-header-cell *matHeaderCellDef class="right">Unbilled</mat-header-cell>
<mat-cell *matCellDef="let row" class="right">{{row.kot | number:'1.2-2'}}</mat-cell>
</ng-container>
<!-- Sale Column -->
<ng-container matColumnDef="sale">
<mat-header-cell *matHeaderCellDef class="right">Sale</mat-header-cell>
<mat-cell *matCellDef="let row" class="right">{{row.regularBill | number:'1.2-2'}}</mat-cell>
</ng-container>
<!-- No Charge Column -->
<ng-container matColumnDef="noCharge">
<mat-header-cell *matHeaderCellDef class="right">No Charge</mat-header-cell>
<mat-cell *matCellDef="let row" class="right">{{row.noCharge | number:'1.2-2'}}</mat-cell>
</ng-container>
<!-- Staff Column -->
<ng-container matColumnDef="staff">
<mat-header-cell *matHeaderCellDef class="right">Staff</mat-header-cell>
<mat-cell *matCellDef="let row" class="right">{{row.staff | number:'1.2-2'}}</mat-cell>
</ng-container>
<!-- Void Column -->
<ng-container matColumnDef="void">
<mat-header-cell *matHeaderCellDef class="right">Void</mat-header-cell>
<mat-cell *matCellDef="let row" class="right">{{row.void | number:'1.2-2'}}</mat-cell>
</ng-container>
<mat-header-row *matHeaderRowDef="displayedColumns"></mat-header-row>
<mat-row *matRowDef="let row; columns: displayedColumns;"></mat-row>
</mat-table>
</mat-card-content>
</mat-card>

25
bookie/src/app/product-sale-report/product-sale-report.component.spec.ts Normal file
View File

@ -0,0 +1,25 @@
import {async, ComponentFixture, TestBed} from '@angular/core/testing';
import {ProductSaleReportComponent} from './product-sale-report.component';
describe('ProductSaleReportComponent', () => {
let component: ProductSaleReportComponent;
let fixture: ComponentFixture<ProductSaleReportComponent>;
beforeEach(async(() => {
TestBed.configureTestingModule({
declarations: [ProductSaleReportComponent]
})
.compileComponents();
}));
beforeEach(() => {
fixture = TestBed.createComponent(ProductSaleReportComponent);
component = fixture.componentInstance;
fixture.detectChanges();
});
it('should create', () => {
expect(component).toBeTruthy();
});
});

90
bookie/src/app/product-sale-report/product-sale-report.component.ts Normal file
View File

@ -0,0 +1,90 @@
import { Component, OnInit } from '@angular/core';
import { FormBuilder, FormGroup } from '@angular/forms';
import { ActivatedRoute, Router } from '@angular/router';
import * as moment from 'moment';
import { ProductSaleReportDataSource } from './product-sale-report-datasource';
import { ProductSaleReport } from './product-sale-report';
import { ToCsvService } from '../shared/to-csv.service';
@Component({
selector: 'app-product-sale-report',
templateUrl: './product-sale-report.component.html',
styleUrls: ['./product-sale-report.component.css']
})
export class ProductSaleReportComponent implements OnInit {
dataSource: ProductSaleReportDataSource;
form: FormGroup;
info: ProductSaleReport;
/** Columns displayed in the table. Columns IDs can be added, removed, or reordered. */
displayedColumns = ['name', 'unbilled', 'sale', 'noCharge', 'staff', 'void'];
constructor(
private route: ActivatedRoute,
private router: Router,
private fb: FormBuilder,
private toCsv: ToCsvService
) {
this.createForm();
}
ngOnInit() {
this.route.data
.subscribe((data: { info: ProductSaleReport }) => {
this.info = data.info;
this.form.setValue({
startDate: moment(this.info.startDate, 'DD-MMM-YYYY').toDate(),
finishDate: moment(this.info.finishDate, 'DD-MMM-YYYY').toDate()
});
this.dataSource = new ProductSaleReportDataSource(this.info.amounts);
});
}
show() {
const info = this.getInfo();
this.router.navigate(['product-sale-report'], {
queryParams: {
startDate: info.startDate,
finishDate: info.finishDate
}
});
}
createForm() {
this.form = this.fb.group({
startDate: '',
finishDate: ''
});
}
getInfo(): ProductSaleReport {
const formModel = this.form.value;
return {
startDate: moment(formModel.startDate).format('DD-MMM-YYYY'),
finishDate: moment(formModel.finishDate).format('DD-MMM-YYYY')
};
}
exportCsv() {
const headers = {
Date: 'date',
Name: 'name',
Type: 'type',
Narration: 'narration',
Debit: 'debit',
Credit: 'credit',
Running: 'running',
Posted: 'posted'
};
const csvData = new Blob([this.toCsv.toCsv(headers, this.dataSource.data)], {type: 'text/csv;charset=utf-8;'});
const link = document.createElement('a');
link.href = window.URL.createObjectURL(csvData);
link.setAttribute('download', 'product-sale-report.csv');
document.body.appendChild(link);
link.click();
document.body.removeChild(link);
}
}

13
bookie/src/app/product-sale-report/product-sale-report.module.spec.ts Normal file
View File

@ -0,0 +1,13 @@
import {ProductSaleReportModule} from './product-sale-report.module';
describe('ProductSaleReportModule', () => {
let productSaleReportModule: ProductSaleReportModule;
beforeEach(() => {
productSaleReportModule = new ProductSaleReportModule();
});
it('should create an instance', () => {
expect(productSaleReportModule).toBeTruthy();
});
});

61
bookie/src/app/product-sale-report/product-sale-report.module.ts Normal file
View File

@ -0,0 +1,61 @@
import { NgModule } from '@angular/core';
import { CommonModule } from '@angular/common';
import { MatAutocompleteModule } from '@angular/material/autocomplete';
import { MatButtonModule } from '@angular/material/button';
import { MatCardModule } from '@angular/material/card';
import { DateAdapter, MAT_DATE_FORMATS, MAT_DATE_LOCALE, MatNativeDateModule } from '@angular/material/core';
import { MatDatepickerModule } from '@angular/material/datepicker';
import { MatFormFieldModule } from '@angular/material/form-field';
import { MatIconModule } from '@angular/material/icon';
import { MatInputModule } from '@angular/material/input';
import { MatTableModule } from '@angular/material/table';
import { SharedModule} from '../shared/shared.module';
import { ReactiveFormsModule } from '@angular/forms';
import { CdkTableModule } from '@angular/cdk/table';
import { ProductSaleReportRoutingModule } from './product-sale-report-routing.module';
import { ProductSaleReportComponent } from './product-sale-report.component';
import { MomentDateAdapter } from '@angular/material-moment-adapter';
import { A11yModule } from '@angular/cdk/a11y';
import { FlexLayoutModule } from '@angular/flex-layout';
export const MY_FORMATS = {
parse: {
dateInput: 'DD-MMM-YYYY',
},
display: {
dateInput: 'DD-MMM-YYYY',
monthYearLabel: 'MMM YYYY',
dateA11yLabel: 'DD-MMM-YYYY',
monthYearA11yLabel: 'MMM YYYY',
},
};
@NgModule({
imports: [
A11yModule,
CommonModule,
CdkTableModule,
FlexLayoutModule,
MatAutocompleteModule,
MatButtonModule,
MatCardModule,
MatDatepickerModule,
MatFormFieldModule,
MatIconModule,
MatInputModule,
MatNativeDateModule,
MatTableModule,
ReactiveFormsModule,
SharedModule,
ProductSaleReportRoutingModule
],
declarations: [
ProductSaleReportComponent
],
providers: [
{provide: DateAdapter, useClass: MomentDateAdapter, deps: [MAT_DATE_LOCALE]},
{provide: MAT_DATE_FORMATS, useValue: MY_FORMATS},
]
})
export class ProductSaleReportModule {
}

15
bookie/src/app/product-sale-report/product-sale-report.service.spec.ts Normal file
View File

@ -0,0 +1,15 @@
import {inject, TestBed} from '@angular/core/testing';
import {ProductSaleReportService} from './product-sale-report.service';
describe('ProductSaleReportService', () => {
beforeEach(() => {
TestBed.configureTestingModule({
providers: [ProductSaleReportService]
});
});
it('should be created', inject([ProductSaleReportService], (service: ProductSaleReportService) => {
expect(service).toBeTruthy();
}));
});

36
bookie/src/app/product-sale-report/product-sale-report.service.ts Normal file
View File

@ -0,0 +1,36 @@
import { Injectable } from '@angular/core';
import { catchError } from 'rxjs/operators';
import { Observable } from 'rxjs/internal/Observable';
import { HttpClient, HttpHeaders, HttpParams } from '@angular/common/http';
import { ProductSaleReport } from './product-sale-report';
import { ErrorLoggerService } from '../core/error-logger.service';
const httpOptions = {
headers: new HttpHeaders({'Content-Type': 'application/json'})
};
const url = '/v1/product-sale-report';
const serviceName = 'ProductSaleReportService';
@Injectable({
providedIn: 'root'
})
export class ProductSaleReportService {
constructor(private http: HttpClient, private log: ErrorLoggerService) {
}
get(startDate: string, finishDate): Observable<ProductSaleReport> {
const options = {params: new HttpParams()};
if (startDate !== null) {
options.params = options.params.set('s', startDate);
}
if (finishDate !== null) {
options.params = options.params.set('f', finishDate);
}
return <Observable<ProductSaleReport>>this.http.get<ProductSaleReport>(url, options)
.pipe(
catchError(this.log.handleError(serviceName, 'get'))
);
}
}

14
bookie/src/app/product-sale-report/product-sale-report.ts Normal file
View File

@ -0,0 +1,14 @@
export class ProductSaleReportItem {
name: string;
kot: number;
regularBill: number;
noCharge: number;
staf: number;
void: number;
}
export class ProductSaleReport {
startDate: string;
finishDate: string;
amounts?: ProductSaleReportItem[];
}

2
bookie/src/app/tax-analysis/tax-analysis.ts
View File

@ -1,5 +1,7 @@
export class TaxAnalysisItem {
name: string;
taxRate: number;
saleAmount: number;
amount: number;
}