Commit Graph

258 Commits

Author SHA1 Message Date
Amritanshu Agrawal 78dcd6b92a Version Bump v9.0.1 2021-04-02 18:30:58 +05:30
Amritanshu Agrawal 4c867138e2 Fix: Kots had the wrong time. 2021-04-02 18:30:42 +05:30
Amritanshu Agrawal c3df28eb64 Version Bump v9.0.0 2021-04-02 14:34:38 +05:30
Amritanshu Agrawal 73850560aa Customer discount with prefill discount in sales. 2021-04-02 14:34:07 +05:30
Amritanshu Agrawal faf83f9356 Version Bump v8.2.0 2021-04-02 07:00:16 +05:30
Amritanshu Agrawal 97579ea9d3 Dates and times should now be handled properly once the server is set on UTC time and the proper timezone offset environment variable is set. 2021-04-02 06:58:38 +05:30
Amritanshu Agrawal 0da16e9548 Feature: Added the customer module to list / edit customers. This is needed to add the customer discount functionality 2021-04-02 06:34:31 +05:30
Amritanshu Agrawal 214c40fbde Version Bump v8.1.0 2021-03-26 08:55:20 +05:30
Amritanshu Agrawal d5b4dfeaca Feature: The guestbook now autocompletes on phone number 2021-03-26 08:54:31 +05:30
Amritanshu Agrawal 095f4fe473 Fix: Reprint was not physically printing the bill. 2021-03-26 07:19:57 +05:30
Amritanshu Agrawal 7ff546a442 Removed dangling file 2021-03-26 07:19:34 +05:30
Amritanshu Agrawal 11600de3a8 Version Bump v8.0.0 2021-03-24 01:47:04 +05:30
Amritanshu Agrawal 0b30ce258c Version Bump v7.3.0 2021-03-20 08:06:20 +05:30
Amritanshu Agrawal 0775d12271 Version Bump v7.2.0 2021-03-19 08:06:54 +05:30
Amritanshu Agrawal c29fde0cb0 Printer Cut Code should be properly handled now in editing as well.
Worker will retry a failed job.
The worker was using the wrong queue name.
2021-03-19 08:06:37 +05:30
Amritanshu Agrawal dc6e7fe467 Version Bump v7.1.2 2021-03-19 06:55:32 +05:30
Amritanshu Agrawal 592f26af20 Fix: The server was also using the worker settings to communicate with redis.
This led to it using the default host and port as the backend .env files do not contain worker settings.
2021-03-19 06:54:55 +05:30
Amritanshu Agrawal e99b8f3070 Version Bump v7.1.1 2021-03-18 21:04:09 +05:30
Amritanshu Agrawal e8d178a248 Fix: ORM Borked when models were split into their own files and product could not find this relation 2021-03-18 18:03:28 +05:30
Amritanshu Agrawal 088982c6d4 Printer import now assigns the cut code for TM-m30
Also, hard-coding of the cut string is removed.
Now need to see how it will be handled in update printer
2021-03-18 17:52:54 +05:30
Amritanshu Agrawal 30685e10a8 Version Bump v7.1.0 2021-03-18 07:12:55 +05:30
Amritanshu Agrawal 4257db020d Version Bump v7.0.0 2021-03-17 10:02:17 +05:30
Amritanshu Agrawal d851714136 Printing working now. The env file for the worker needs to know the printer name.
Then, the address can be used to print the data.
2021-03-17 09:43:19 +05:30
Amritanshu Agrawal ea2bfb1c0c Chore: Moved individual models into their own files.
Chore: Updated dependencies.
2021-03-17 09:39:56 +05:30
Amritanshu Agrawal 716c74c974 Version Bump v6.3.0 2020-12-25 11:47:35 +05:30
Amritanshu Agrawal 6257313792 Version Bump v6.2.0 2020-12-24 12:59:44 +05:30
Amritanshu Agrawal 161896154d Feature: Open bill using bill number 2020-12-24 12:58:46 +05:30
Amritanshu Agrawal 565cffaef1 Fix: Kot move fixed. Kot id was missing on move. Also, voucher_type KOT as truthy not and would give bill not found error. 2020-12-24 09:10:55 +05:30
Amritanshu Agrawal 7550ced477 Version Bump v6.1.5 2020-12-21 11:24:42 +05:30
Amritanshu Agrawal b85e930ace Moved all auth schemas into their own files. Updated imports. 2020-12-21 11:18:58 +05:30
Amritanshu Agrawal c6da3b9e38 Version Bump v6.1.4 2020-12-21 08:03:15 +05:30
Amritanshu Agrawal 4386ee45b8 Fix: Add Tax was not working as TaxIn required a name with length more than 1. 2020-12-21 08:02:36 +05:30
Amritanshu Agrawal f65c19ce1a Version Bump v6.1.3 2020-12-20 08:05:21 +05:30
Amritanshu Agrawal 9b55d037f2 Fixed: Add new modifier category error 2020-12-20 08:04:53 +05:30
Amritanshu Agrawal 4e3362c614 Version Bump v6.1.2 2020-12-19 10:43:03 +05:30
Amritanshu Agrawal 7bd46a946e Version Bump v6.1.1 2020-12-19 09:09:51 +05:30
Amritanshu Agrawal 8bb6235e67 Fix: Receive Payment
Since the amount Behaviour Subject pipe was not being subscribed to
and the original Behaviour Subject as being subscribed,
 amountVal was not being populated. Now it will be.
This was creating problem where amount in receive payment was always 0
Added a check in the backend so that if any part of bill remains unsettled, it will give an error instead of silently accepting and removing the entry.
2020-12-19 09:09:10 +05:30
Amritanshu Agrawal 36915b41c1 Version Bump v6.1.0 2020-12-18 13:25:34 +05:30
Amritanshu Agrawal f28cf1eea0 Split bill working along with all checks.
Update bill ensures that the total number of happy hour punches of a product in a bill are less than or equal to the regular punches
2020-12-18 13:24:05 +05:30
Amritanshu Agrawal 608dde4619 Fix: Modifier Category was borking as it was sending the product version id instead of product id in modifier category info 2020-12-18 12:53:08 +05:30
Amritanshu Agrawal 63f5871350 Version Bump v6.0.0 2020-12-16 22:40:36 +05:30
Amritanshu Agrawal 6c83c74424 Chore: In overlord / sale / bill.service now the BillViewItem is just a view item
The data is kept as the original bill object and this view generated on every change. It has no sanctity.

To deal with the challenges of Selection of items in the bill.component.html created a bill selection item.
This is converted to string while checking else the selection model fails.

Feature: It now checks if Happy Hour items have equivalent regular items in each kot.
Feature: Discount won't apply to happy hour items.
Checks for both are both in front end and back end.
2020-12-16 22:34:41 +05:30
Amritanshu Agrawal 28952402aa Fix: Loaded voucher was not showing H H name in Happy Hour products 2020-12-16 12:28:39 +05:30
Amritanshu Agrawal 02e208cd4e Version Bump v5.4.0 2020-12-16 11:50:23 +05:30
Amritanshu Agrawal e4500f0d46 Breaking: Discount is applicable on sale category and not on menu category
Fix the import, etc on this.
While entering discount in sale, it checks the max allowed.
2020-12-16 11:49:22 +05:30
Amritanshu Agrawal e229ecefa2 Version Bump v5.3.1 2020-12-15 22:40:24 +05:30
Amritanshu Agrawal 22de4f7624 Fix: Reports were not working as they were not adapted to the new Enums
Fix: The docker image borked on printing as it did not have the en_IN locale
Fix: Angular errored as it needed typescript < 4.1.0
Fix: chd yml had a typo in host name
2020-12-15 22:15:51 +05:30
Amritanshu Agrawal 5a73387404 Version Bump v5.3.0 2020-12-14 18:27:10 +05:30
Amritanshu Agrawal 4f5ba47d46 Added the docker files and ansible playbooks for two instances namely pkl and chd. 2020-12-14 17:58:00 +05:30
Amritanshu Agrawal 294f53147f Version Bump: v5.2.0 2020-12-13 13:20:46 +05:30
Amritanshu Agrawal afc58d566c Fix: Permissions for header-footer.
The persission Owner is only for Settle Option and Header / Footer
2020-12-13 13:19:42 +05:30
Amritanshu Agrawal 3ad73dff1c Feature: Now a tax can be broken up into multiple components while bill printing.
This is especially for GST. The format for the tax name is
"Display name 1 (Ratio eg. 1/2) ; Display name 1 (Ratio eg. 1/2)"
eg.
"SGST on Food @ 2.5% (1/2) ; CGST on Food @ 2.5% (1/2)"
or
"UTGST on Food @ 2.5% (1/2) ; CGST on Food @ 2.5% (1/2)"

Feature:
All report printing now uses local aware number formatting for Indian locale.
2020-12-13 13:14:19 +05:30
Amritanshu Agrawal 27aa4d12a6 Settle Options are now stored in the Database and can be updated 2020-12-13 09:45:24 +05:30
Amritanshu Agrawal d65379a068 Chore: ng lint using the recommended @angular-eslint style 2020-12-08 18:50:46 +05:30
Amritanshu Agrawal 130d9197e5 Version bump v5.1.0 2020-11-25 12:39:05 +05:30
Amritanshu Agrawal e16e1822b8 Fix: Modifier Categories was not showing the names of Menu Categories in Modifier Category Detail Component. This was because the Menu Category Link had only the id field.
Took this time to improve the Modifier route.
2020-11-25 12:38:22 +05:30
Amritanshu Agrawal d9e0397b21 Version bump v5.1.0 2020-11-25 10:07:26 +05:30
Amritanshu Agrawal b583b90756 Fully working with the rule no explicit any 2020-11-25 09:27:42 +05:30
Amritanshu Agrawal 84535ca9bb Version bump to v5.0.2 2020-11-22 23:21:54 +05:30
Amritanshu Agrawal 3f49bea039 Version Bump to v5.0.0 2020-11-22 10:14:51 +05:30
Amritanshu Agrawal 6567f560ab Updated to angular 11
Now compiling with strict mode in typescript
Need to error checking now
2020-11-22 10:13:37 +05:30
Amritanshu Agrawal cabd6f2ea1 Version bump v4.3.0 2020-11-15 13:00:58 +05:30
Amritanshu Agrawal 88f5b26948 Import marks inactive products as valid till one day before import 2020-11-15 12:58:12 +05:30
Amritanshu Agrawal 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
Amritanshu Agrawal aead1f1b36 Version bump to v4.2.0 2020-11-13 13:24:55 +05:30
Amritanshu Agrawal 2dd9f7d962 Guest book now shows table status and link to open table 2020-11-13 13:23:34 +05:30
Amritanshu Agrawal ef1ee35b65 Version Bump v4.1.1 2020-11-13 09:35:33 +05:30
Amritanshu Agrawal 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
Amritanshu Agrawal 9317150bde Version Bump v4.1.0 2020-11-12 12:33:26 +05:30
Amritanshu Agrawal 5e180f48d5 Update Product Prices built 2020-11-12 12:32:16 +05:30
Amritanshu Agrawal d5b2da4388 Product updates report. 2020-11-11 12:18:10 +05:30
Amritanshu Agrawal 6f9394dc8d Chore: Start and Finish date in reports extracted to function 2020-11-11 10:09:07 +05:30
Amritanshu Agrawal 8db9a7d757 Header / Footer editor added - Right now linked to products permission, which should be changed 2020-11-11 09:56:16 +05:30
Amritanshu Agrawal 77fb8e8428 Did not add the docker entrypoint file
v4.0.1
2020-11-10 13:36:54 +05:30
Amritanshu Agrawal de1b199da0 Version bump to v4.0.0 due to temporal products 2020-11-10 12:46:32 +05:30
Amritanshu Agrawal de235f3d9e Product should now be fixed.
Need to allow later editing now.
2020-11-10 11:47:25 +05:30
Amritanshu Agrawal a92726f5e6 Product list / detail / router fully working.
Need to test the sale / reports
2020-11-09 12:44:27 +05:30
Amritanshu Agrawal 4aaa3fc72b Import data also adds all permissions to owner role 2020-11-08 20:01:27 +05:30
Amritanshu Agrawal 94b63e4385 Product List and Query working 2020-11-08 19:09:31 +05:30
Amritanshu Agrawal 0c9ebd29d7 Initial setup for temporal products table.
Updated the model and the data import.
Now for all the routers and then update products
2020-11-07 21:09:58 +05:30
Amritanshu Agrawal 9ea143d233 version bump
v3.1.0
2020-10-29 07:46:11 +05:30
Amritanshu Agrawal 4108040cdd new tag v3.1.0
Fix:
  Company references left after the field was removed
2020-10-29 07:32:04 +05:30
Amritanshu Agrawal 969b774a25 Fixed Worker 2020-10-28 11:02:35 +05:30
Amritanshu Agrawal 1e69c8eeeb Importing now working
except u-product_group_modifier. It does not fit in the new scheme. Will remove in next commit so that it is added to log if needed later.
2020-10-28 02:16:55 +05:30
Amritanshu Agrawal 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
Amritanshu Agrawal cbc2f29e29 Bump to version 3.0.0
Printing done on:
 Cashier Report
 Discount Report
 Sale Report
2020-10-27 12:13:17 +05:30
Amritanshu Agrawal 00fe2410b7 blacked, isorted, flake8ed and moved to arq/redis from celery/rabbitmq 2020-10-24 11:53:12 +05:30
Amritanshu Agrawal 1d6baa9d1d fix: Worker command 2020-10-14 09:29:44 +05:30
Amritanshu Agrawal fc6eebed19 Infrastructure to build the worker docker and run it. 2020-10-14 08:19:42 +05:30
Amritanshu Agrawal 99f5f09c17 Bump to v2.0.0 2020-10-11 21:02:51 +05:30
Amritanshu Agrawal b7f382cac8 Bill change should be working
Reduce quantity should be working.
2020-10-11 20:53:43 +05:30
Amritanshu Agrawal 7baf79c3fa Fix: ValueErrors should be HTTPException 2020-10-11 11:20:12 +05:30
Amritanshu Agrawal 9ecf0b5cc9 Display frontend / backend version at the homescreen 2020-10-11 11:13:06 +05:30
Amritanshu Agrawal d677cfb1ea Blacked and isorted the python files
Prettied and eslinted the typescript/html files
2020-10-11 10:56:29 +05:30
Amritanshu Agrawal 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
Amritanshu Agrawal 066d43a373 Moved barker one level down and using poetry for setup 2020-10-11 09:06:51 +05:30
Amritanshu Agrawal 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
Amritanshu Agrawal aaac5efea2 Feature:
Basic infra to print stuff, not working
2020-09-29 11:18:24 +05:30
Amritanshu Agrawal 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
Amritanshu Agrawal f8778fee74 Ported:
Split bill done - TODO: If the products have different price due to paid modifiers
2020-09-28 08:09:38 +05:30
Amritanshu Agrawal cf34c2b855 Ported:
Table Merge/Move and Kot Merge/Move
2020-09-25 08:50:39 +05:30
Amritanshu Agrawal 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
Amritanshu Agrawal 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
Amritanshu Agrawal 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
Amritanshu Agrawal 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
Amritanshu Agrawal cabdd505e0 Ported:
Customer
  Device
  Role
  Settings
2020-09-22 08:12:41 +05:30
Amritanshu Agrawal 7b6c09cea3 All Reports done!! 2020-06-17 09:57:41 +05:30
Amritanshu Agrawal 938bb67e0a All Masters Done!! 2020-06-15 21:40:12 +05:30
Amritanshu Agrawal 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 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 ee54e36dda Added routes for serving index.html for various routes.
Depreciated: Customers
TODO: Reprint, Setting, Change (ie. voucher void and reprint)
2019-08-21 16:16:46 +05:30
Amritanshu 992a6b6767 Fix: Checkout was broken 2019-08-21 14:37:46 +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 63c7a541dc Fix: Importing was messed up
Fix: Cashier checkout kept changing the date
2019-08-20 14:42:43 +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 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 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 6ace2078bd Added the Sales Categories to migrate updated the others 2019-06-20 19:50:03 +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