tanshu/barker
1
0
Fork 0
Code Issues 1 Pull Requests Releases 4 Activity
175 Commits 1 Branch 29 Tags 5.6 MiB
f4caa19bb2
Commit Graph

138 Commits

Author SHA1 Message Date
tanshu
163b40e9e5 Simplified some permissions 
Renamed Accounts Audit to Audit
Renamed Machines to Devices as it made sense
Sections and Tables are now under Sections Permission
Guest Book is now under Customers Permission
Renamed Beer Consumption Report to Beer Sale Report
Fix: Move Kot and Table to check what the final effect is
 2020-11-15 12:26:24 +05:30
tanshu
aead1f1b36 Version bump to v4.2.0 2020-11-13 13:24:55 +05:30
tanshu
2dd9f7d962 Guest book now shows table status and link to open table 2020-11-13 13:23:34 +05:30
tanshu
ef1ee35b65 Version Bump v4.1.1 2020-11-13 09:35:33 +05:30
tanshu
67cb1e3d80 Fix: Save/Update voucher - timedelta was days instead of minutes 
Fix: Product list for sale was sending product_version_id instead of version_id this was borking on products with multiple versions
Change: Update Product Prices initially does not show list. Only the date and Menu Category List
 2020-11-13 09:34:49 +05:30
tanshu
9317150bde Version Bump v4.1.0 2020-11-12 12:33:26 +05:30
tanshu
5e180f48d5 Update Product Prices built 2020-11-12 12:32:16 +05:30
tanshu
d5b2da4388 Product updates report. 2020-11-11 12:18:10 +05:30
tanshu
8db9a7d757 Header / Footer editor added - Right now linked to products permission, which should be changed 2020-11-11 09:56:16 +05:30
tanshu
77fb8e8428 Did not add the docker entrypoint file 
v4.0.1
 2020-11-10 13:36:54 +05:30
tanshu
de1b199da0 Version bump to v4.0.0 due to temporal products 2020-11-10 12:46:32 +05:30
tanshu
a92726f5e6 Product list / detail / router fully working. 
Need to test the sale / reports
 2020-11-09 12:44:27 +05:30
tanshu
9ea143d233 version bump 
v3.1.0
 2020-10-29 07:46:11 +05:30
tanshu
4108040cdd new tag v3.1.0 
Fix:
  Company references left after the field was removed
 2020-10-29 07:32:04 +05:30
tanshu
f8683cf080 Devices have replaced Clients for authentication as well as location using sections. 
Printing of reports done.
Main section is now a fixture

User and Devices list gives last login details.
 2020-10-27 16:59:24 +05:30
tanshu
cbc2f29e29 Bump to version 3.0.0 
Printing done on:
 Cashier Report
 Discount Report
 Sale Report
 2020-10-27 12:13:17 +05:30
tanshu
00fe2410b7 blacked, isorted, flake8ed and moved to arq/redis from celery/rabbitmq 2020-10-24 11:53:12 +05:30
tanshu
99f5f09c17 Bump to v2.0.0 2020-10-11 21:02:51 +05:30
tanshu
b7f382cac8 Bill change should be working 
Reduce quantity should be working.
 2020-10-11 20:53:43 +05:30
tanshu
73f83f1aa7 Show proper error messages on Save Bill / Save Kot 2020-10-11 11:59:37 +05:30
tanshu
9ecf0b5cc9 Display frontend / backend version at the homescreen 2020-10-11 11:13:06 +05:30
tanshu
d677cfb1ea Blacked and isorted the python files 
Prettied and eslinted the typescript/html files
 2020-10-11 10:56:29 +05:30
tanshu
b31db593c2 Updated to angular 10 
Moved to eslint for linting
Added prettier for formatting
Fixed minor errors
 2020-10-11 09:34:35 +05:30
tanshu
3f2a06c2cf Feature: 
Print kot and print bill are working now using celery

Now also need to install RabbitMQ for clery to work
 2020-10-01 11:43:43 +05:30
tanshu
046504e097 Ported: 
Change (Reprint bill)

Chore:
  Refactored save voucher so that the save function can be reused in change voucher route

Fix:
  Show voucher sent modifiers in a wrong format
  Inventory schema used rate instead of price
 2020-09-29 11:03:03 +05:30
tanshu
f8778fee74 Ported: 
Split bill done - TODO: If the products have different price due to paid modifiers
 2020-09-28 08:09:38 +05:30
tanshu
cf34c2b855 Ported: 
Table Merge/Move and Kot Merge/Move
 2020-09-25 08:50:39 +05:30
tanshu
bf09471e9e Fix: 
Discount button was greyed out due to wrong check.
  Show was sending customer as empty dictionary which triggered an error in input as id was a required column
 2020-09-24 09:18:58 +05:30
tanshu
578385f866 Chore: 
Deduplicated the settle options function for save/update/void/receive payment

Ported:
  Void
  Receive payment
 2020-09-24 08:47:09 +05:30
tanshu
6c06271315 Ported: 
Guest Book
  Save bill
  Update bill
  Show bill

Fix:
  Tax details was sending the rate multiplied by 100 but not dividing it on save/update

Feature:
  Updated the auth service to check local storage for the latest user token
 2020-09-24 07:39:46 +05:30
tanshu
b19d8cc030 Ported: 
Guest Book

Chore:
  Added New Day Offset and Timezone Offset in settings so that they can be shared consistently and also set in runtime.
 2020-09-22 10:53:31 +05:30
tanshu
7b6c09cea3 All Reports done!! 2020-06-17 09:57:41 +05:30
tanshu
938bb67e0a All Masters Done!! 2020-06-15 21:40:12 +05:30
tanshu
fdfd3dcbfb Added: Alembic for migrations 
Moving from Pyramid to FastAPI
 2020-06-14 18:43:10 +05:30
Amritanshu
0c0a2990a8 In case of a table with no guest, it will ask for pax 2019-08-26 15:11:28 +05:30
Amritanshu
a12f093828 Renamed void_reason to reason so that we can store the employee name in case of Staff and NC reason in case of NC bills. 
Settling NC and Staff bills now asks for Staff name / NC reason
 2019-08-25 23:22:50 +05:30
Amritanshu
6d0f30503a Renamed Report permissions to make more sense 
Removed the void and reprints report and added it to the bill settlement report
updated the import to add a new sql to be executed later to update the settlements and report permission names
Export works on all reports
 2019-08-25 15:08:59 +05:30
Amritanshu
05860fb0b9 Added nav-bar to show home link and user status 2019-08-22 14:15:02 +05:30
Amritanshu
04fb6dfcab Fix: Move table was checking !x instead of !!x and so was not working 
Added checks to void bill, split bill and move table
 2019-08-21 17:02:06 +05:30
Amritanshu
461db9d8fa Fix: Wrong permission of sales 2019-08-21 15:40:46 +05:30
Amritanshu
2c0c91b136 Modifiers popup not scrolling fixed 2019-08-21 15:39:01 +05:30
Amritanshu
5603c5d8fb Fix: Product units 2019-08-21 14:27:11 +05:30
Amritanshu
fd1111f378 Display units in Sale / Product and don't show brackets when no units entered 2019-08-21 14:13:53 +05:30
Amritanshu
b898e26dc6 Added the final missing Voids or Reprints report aslo. 
Ready for beta 1.
Removed voucher.is_void in favour voucher_type == void
 2019-08-21 13:23:41 +05:30
Amritanshu
2b04b624b3 Discount Report Done 2019-08-21 12:31:52 +05:30
Amritanshu
8f6c5930ee Beer consumption report done 2019-08-21 11:12:30 +05:30
Amritanshu
243c3cb280 Bill Settlement Report Done (Bill Details) 
TODO: Rename Bill Details Permission to Bill Settlement Report
 2019-08-21 10:02:28 +05:30
Amritanshu
0f00d96dc9 Product Sale Module done (Sales Detail) -- need to rename the permission 2019-08-21 09:27:19 +05:30
Amritanshu
241568622e Feature: Tax Analysis 2019-08-21 08:32:12 +05:30
Amritanshu
abc29844d3 Fixed a lot of permissions 2019-08-21 00:07:46 +05:30
Amritanshu
70d31fea5e Feature: Sale Analysis is working 
Fix: Cashier Checkout multiple entries
 2019-08-20 23:02:42 +05:30
Amritanshu
29850e367e Fix: Sales was not working as it was checking the wrong permission 
Fix: Type in title of cashier checkout html
Fix: Import was adding everthing to first user as initially users were not being imported
 2019-08-20 00:12:01 +05:30
Amritanshu
2474e3ef25 Fixed a few errors which showed up when ng build --prod was used 
Removed the loading bar component as it was giving build troubles and can be added back later
Added the HttpClientModule import to app.module without which it will not run
 2019-08-19 17:50:04 +05:30
Amritanshu
9a03428c92 Setup for serving the production build of frontend from the pyramid app 2019-08-19 16:39:10 +05:30
Amritanshu
f9e784b12f Cashier checkout should now work 2019-08-19 15:58:02 +05:30
Amritanshu
55ec2f8763 Fix: get_bill_id now skips the 10000th number so that it displays properly in our system 
Bill now shows the bill details on the top

Started adding checks for disabled features during sales.
 2019-08-18 22:05:33 +05:30
Amritanshu
e697631cd4 Move / Merge KOT Done. 
We need to check if it is the only kot and raise an error if it is.
Split Bill Done
 2019-08-18 17:05:27 +05:30
Amritanshu
dcaf23b390 Tax is added directly to product for sale 
Auth guard and auth service simplified and fixed so that user is updated upon login
Home component changed to use square buttons
Fixed showing the totals in the bill

ng linted the project
 2019-08-11 01:37:14 +05:30
Amritanshu
d7fdf751b9 Made the voucher calls more readable 2019-08-10 19:43:35 +05:30
Amritanshu
40a958a935 Void Bill Working 2019-08-10 18:49:05 +05:30
Amritanshu
2fcff26e34 Move Table with confirm 2019-08-10 17:22:25 +05:30
Amritanshu
4fb8d9118e Bill now displays Net, Tax, Discount and Gross Amounts 
Stylings: The bill table rows are properly centred instead of aligned to top
 2019-08-10 10:30:27 +05:30
Amritanshu
ff8f4ffb16 Receive payment working. 
TODO: Nested subscribe in Receive Payment in sales-home-component.ts should be refactored into something more readable.
 2019-08-09 14:55:38 +05:30
Amritanshu
6503982897 Added hasPermission function to the auth service to check for permissions. 
Added: Bill Type selection
Fix: Add product would add to old kots if product was added earlier
 2019-08-08 16:35:03 +05:30
Amritanshu
c81b92c336 Fix: import script to fit the new structure of voucher table (is_printed field removed, voucher_type != KOT is now assumed to be printed) 
Fix: Take-away bill type is now removed
Fix: Table overview now shows the right amounts
Voucher Save and Update should now work
Discounts now working (permissions are not checked)
 2019-08-08 13:31:30 +05:30
Amritanshu
7d06a2f961 Save Bill Works 2019-07-13 21:32:18 +05:30
Amritanshu
bcad4cdae3 No automatic signout 
Voucher basic working
running tables shifted to cards from buttons, this gives us immense styling oportunities
 2019-07-12 12:36:38 +05:30
Amritanshu
4513e8b263 Bills initially working just as proof of concept 
ng linted
modifier categories list is better at displaying data sanely now
 2019-07-11 12:17:41 +05:30
Amritanshu
d69ab0063a Big Chunk of updates on way to making the sales portion working 2019-07-06 13:46:18 +05:30
Amritanshu
87076d9c00 Guest book 2019-06-25 17:13:56 +05:30
Amritanshu
7b08fe611f Feature: 
SectionPrinter is now working
Migration:
Section, Printers, SectionPrinters working
 2019-06-25 16:44:59 +05:30
Amritanshu
142a0f5a8a Section 2019-06-23 19:29:33 +05:30
Amritanshu
20801afc8a Removed IsModifierCompulsory from MenuCategory as it is now not needed and minimum in ModifierCategory set to non-zero to achieve the same. 
Fix: DiscountLimit was not scaled to 100 in MenuCategory detail. So it is now chaled in the json and scaled back in the frontend for the list as that was not supposed to be scaled.
Feature: Modifier is now done
Fix: In product save, it was checking menu_category second time again instead of sale_category
 2019-06-22 08:49:33 +05:30
Amritanshu
e13ed38640 Modifier categories works 2019-06-21 01:29:54 +05:30
Amritanshu
e1c42d4470 Modifier Category table added as a parent of modifiers 
They are also linked to products / menu categroies as to which products they can be used on
The linking to menu categories is done in the frontend, database is linked directly to products
Treeview for menu categories yet to be done in modifier category detail form
 2019-06-20 17:45:28 +05:30
Amritanshu
05f8058a15 Product Group renamed to Menu Category 
Extracted Product Group -> Group_type to a a new object called Sale Category.
Moved tax from product to Sale Category for uniform taxes on types of sales.
 2019-06-20 13:15:23 +05:30
Amritanshu
16455fdcac TODO: Refactor the product and productgroup tables as per the comments added. 
rename the product group table to either product category or menu category
move the group_type field from productgroup to products and name it sales category eg. Food, beverage, etc. also, set the tax for sales category and not individual product
Added the printers permission to end of permissions and only for owner, set them right
 2019-06-20 01:59:11 +05:30
Amritanshu
c51a9bd5ff Users fix 2019-06-20 00:28:39 +05:30
Amritanshu
93743bdc8e Users 2019-06-20 00:17:44 +05:30
Amritanshu
2b2624c9c2 Roles 2019-06-19 23:55:42 +05:30
Amritanshu
63f5f60842 Still in progress 2019-06-17 13:23:00 +05:30
Amritanshu
32500665b5 Table Sort Order Done 2019-06-16 21:08:18 +05:30
Amritanshu
bcb158b837 Product Error on *ngIf, new a dealbreaker, but not sure. 2019-06-16 20:50:38 +05:30
Amritanshu
52e978b3b0 Product Group 2019-06-16 10:14:10 +05:30
Amritanshu
459ab244ff Tax done 2019-06-15 23:09:43 +05:30
Amritanshu
3dcf1c4c42 Running tables: Initial working sample just shows a row of buttons 2019-06-15 13:04:25 +05:30
Amritanshu
5093bdc391 Tables List and Detail working 
TODO: Save SortOrder also, Drag and Drop ordering
 2019-06-14 09:28:30 +05:30
Amritanshu
d59c60e81d Initial commit for the Angular part. We are nowhere yet. 2019-06-14 00:32:34 +05:30