Skip to content

Commit

Permalink
Cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
@jigartarpara
jigartarpara committed Oct 2, 2022
1 parent 68e8471 commit 3d59993
Show file tree
Hide file tree
Showing 4 changed files with 152 additions and 167 deletions.
258 changes: 129 additions & 129 deletions bookingapp/booking_service_app/doctype/book_service/book_service.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,146 +10,146 @@


class BookService(Document):
def validate(self):
msg = self.validate_booking_date()
if msg:
frappe.throw(msg)
def validate(self):
msg = self.validate_booking_date()
if msg:
frappe.throw(msg)

@frappe.whitelist()
def validate_booking_date(self):
for row in self.book_item:
is_booked = self.check_item_is_booked(row)
if is_booked:
return is_booked
return ""
@frappe.whitelist()
def validate_booking_date(self):
for row in self.book_item:
is_booked = self.check_item_is_booked(row)
if is_booked:
return is_booked
return ""

def check_item_is_booked(self, row):
delivery_date, return_date, item = row.delivery_date, row.return_date, row.item
if delivery_date:
filters = {}
filters = {'item': item, 'docstatus': 1}
def check_item_is_booked(self, row):
delivery_date, return_date, item = row.delivery_date, row.return_date, row.item
if delivery_date:
filters = {}
filters = {'item': item, 'docstatus': 1}

filters.update({'delivery_date': ['<=', delivery_date]})
filters.update({'return_date': ['>=', delivery_date]})
filters.update({'docstatus': ['!=', 2]})
filters.update({'name': ['!=', row.name]})
filters.update({'delivery_date': ['<=', delivery_date]})
filters.update({'return_date': ['>=', delivery_date]})
filters.update({'docstatus': ['!=', 2]})
filters.update({'name': ['!=', row.name]})

bookings = frappe.get_all('Book Service Item', filters=filters, fields=[
'name', 'delivery_date', 'return_date', 'parent'])
bookings = frappe.get_all('Book Service Item', filters=filters, fields=[
'name', 'delivery_date', 'return_date', 'parent'])

for booking in bookings:
return "Already Booked: ID " + booking.parent
for booking in bookings:
return "Already Booked: ID " + booking.parent

if return_date:
filters = {}
filters = {'item': item, 'docstatus': 1}
filters.update({'delivery_date': ['<=', return_date]})
filters.update({'return_date': ['>=', return_date]})
filters.update({'docstatus': ['!=', 2]})
filters.update({'name': ['!=', row.name]})
if return_date:
filters = {}
filters = {'item': item, 'docstatus': 1}
filters.update({'delivery_date': ['<=', return_date]})
filters.update({'return_date': ['>=', return_date]})
filters.update({'docstatus': ['!=', 2]})
filters.update({'name': ['!=', row.name]})

bookings = frappe.get_all('Book Service Item', filters=filters, fields=[
'name', 'delivery_date', 'return_date', 'parent'])
bookings = frappe.get_all('Book Service Item', filters=filters, fields=[
'name', 'delivery_date', 'return_date', 'parent'])

for booking in bookings:
return "Already Booked: ID " + booking.parent
for booking in bookings:
return "Already Booked: ID " + booking.parent

if delivery_date and return_date:
if delivery_date and return_date:

filters = {}
filters = {'item': item, 'docstatus': 1}
filters.update({'name': ['!=', row.name]})
filters.update(
{'delivery_date': ['between', delivery_date+" and " + return_date]})
filters = {}
filters = {'item': item, 'docstatus': 1}
filters.update({'name': ['!=', row.name]})
filters.update(
{'delivery_date': ['between', delivery_date+" and " + return_date]})

bookings = frappe.get_all('Book Service Item', filters=filters, fields=[
'name', 'delivery_date', 'return_date', 'parent'])
bookings = frappe.get_all('Book Service Item', filters=filters, fields=[
'name', 'delivery_date', 'return_date', 'parent'])

for booking in bookings:
return "3 Already Booked: ID " + booking.parent + " \n" + str(filters)
for booking in bookings:
return "3 Already Booked: ID " + booking.parent + " \n" + str(filters)

filters = {}
filters = {'item': item, 'docstatus': 1}
filters.update({'name': ['!=', row.name]})
filters.update(
{'return_date': ['between', delivery_date+" and " + return_date]})
filters = {}
filters = {'item': item, 'docstatus': 1}
filters.update({'name': ['!=', row.name]})
filters.update(
{'return_date': ['between', delivery_date+" and " + return_date]})

bookings = frappe.get_all('Book Service Item', filters=filters, fields=[
'name', 'delivery_date', 'return_date', 'parent'])
bookings = frappe.get_all('Book Service Item', filters=filters, fields=[
'name', 'delivery_date', 'return_date', 'parent'])

for booking in bookings:
return "Already Booked: ID " + booking.parent + " \n" + str(filters)
for booking in bookings:
return "Already Booked: ID " + booking.parent + " \n" + str(filters)

if return_date < delivery_date:
return "Return date should be after delivery date"
if return_date < delivery_date:
return "Return date should be after delivery date"

return False
return False


@frappe.whitelist()
def make_sales_order(source_name, target_doc=None):
cst = frappe.db.get_value("Book Service", source_name, ["customer"])
customer = frappe.db.get_value("Customer", {"name": cst}, [
"name", "customer_name"], as_dict=True)

def set_missing_values(source, target):
if customer:
target.customer = customer.name
target.customer_name = customer.customer_name
target.ignore_pricing_rule = 1
target.flags.ignore_permissions = True
target.run_method("set_missing_values")
target.run_method("calculate_taxes_and_totals")

def update_item(obj, target, source_parent):
target.stock_qty = flt(obj.quantity)

doclist = get_mapped_doc("Book Service", source_name, {
"Book Service": {
"doctype": "Sales Order",
"field_map": {
"parent": "book_service"
},
"validation": {
"docstatus": ["=", 1]
}
},
"Book Service Item": {
"doctype": "Sales Order Item",
"field_map": {
"service_item": "item_code"
},
"postprocess": update_item
},
"Sales Taxes and Charges": {
"doctype": "Sales Taxes and Charges",
"add_if_empty": True
},
"Sales Team": {
"doctype": "Sales Team",
"add_if_empty": True
}
}, target_doc, set_missing_values, ignore_permissions=True)

# postprocess: fetch shipping address, set missing values

return doclist
cst = frappe.db.get_value("Book Service", source_name, ["customer"])
customer = frappe.db.get_value("Customer", {"name": cst}, [
"name", "customer_name"], as_dict=True)

def set_missing_values(source, target):
if customer:
target.customer = customer.name
target.customer_name = customer.customer_name
target.ignore_pricing_rule = 1
target.flags.ignore_permissions = True
target.run_method("set_missing_values")
target.run_method("calculate_taxes_and_totals")

def update_item(obj, target, source_parent):
target.stock_qty = flt(obj.quantity)

doclist = get_mapped_doc("Book Service", source_name, {
"Book Service": {
"doctype": "Sales Order",
"field_map": {
"parent": "book_service"
},
"validation": {
"docstatus": ["=", 1]
}
},
"Book Service Item": {
"doctype": "Sales Order Item",
"field_map": {
"service_item": "item_code"
},
"postprocess": update_item
},
"Sales Taxes and Charges": {
"doctype": "Sales Taxes and Charges",
"add_if_empty": True
},
"Sales Team": {
"doctype": "Sales Team",
"add_if_empty": True
}
}, target_doc, set_missing_values, ignore_permissions=True)

# postprocess: fetch shipping address, set missing values

return doclist


@frappe.whitelist()
def get_book_service_details(start, end, filters=None):
events = []
events = []

event_color = {
0: "#ffdd9e",
1: "#cdf5a6",
2: "#8a0404"
}
event_color = {
0: "#ffdd9e",
1: "#cdf5a6",
2: "#8a0404"
}

from frappe.desk.reportview import get_filters_cond
conditions = get_filters_cond("Book Service", filters, [])
from frappe.desk.reportview import get_filters_cond
conditions = get_filters_cond("Book Service", filters, [])

bookservices = frappe.db.sql(""" SELECT `tabBook Service`.name,`tabBook Service`.docstatus, `tabBook Service`.customer,
bookservices = frappe.db.sql(""" SELECT `tabBook Service`.name,`tabBook Service`.docstatus, `tabBook Service`.customer,
ifnull(`tabBook Service Item`.note, ''),
min(`tabBook Service Item`.delivery_date) as from_time,
max(`tabBook Service Item`.return_date) as to_time
Expand All @@ -158,24 +158,24 @@ def get_book_service_details(start, end, filters=None):
`tabBook Service`.name = `tabBook Service Item`.parent {0}
group by `tabBook Service`.name""".format(conditions), as_dict=1)

for d in bookservices:
subject_data = []
for field in ["name", "customer", "item", "note"]:
if not d.get(field):
continue
for d in bookservices:
subject_data = []
for field in ["name", "customer", "item", "note"]:
if not d.get(field):
continue

subject_data.append(d.get(field))
subject_data.append(d.get(field))

color = event_color.get(d.docstatus)
# color = "#cdf5a6"
job_card_data = {
'from_time': d.from_time,
'to_time': d.to_time,
'name': d.name,
'subject': '\n'.join(subject_data),
'color': color if color else "#89bcde"
}
color = event_color.get(d.docstatus)
# color = "#cdf5a6"
job_card_data = {
'from_time': d.from_time,
'to_time': d.to_time,
'name': d.name,
'subject': '\n'.join(subject_data),
'color': color if color else "#89bcde"
}

events.append(job_card_data)
events.append(job_card_data)

return events
return events
32 changes: 16 additions & 16 deletions bookingapp/booking_service_app/doctype/book_service/book_service_calendar.js
View file
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
frappe.views.calendar['Book Service'] = {
field_map: {
start: 'from_time',
end: 'to_time',
id: 'name',
allDay: 'allDay',
title: 'subject',
// status: 'event_type',
color: 'color'
},
gantt: true,
style_map: {
Public: 'success',
Private: 'info'
},
// order_by: 'to_time',
get_events_method: 'bookingapp.booking_service_app.doctype.book_service.book_service.get_book_service_details'
field_map: {
start: 'from_time',
end: 'to_time',
id: 'name',
allDay: 'allDay',
title: 'subject',
// status: 'event_type',
color: 'color'
},
gantt: true,
style_map: {
Public: 'success',
Private: 'info'
},
// order_by: 'to_time',
get_events_method: 'bookingapp.booking_service_app.doctype.book_service.book_service.get_book_service_details'
}
22 changes: 0 additions & 22 deletions ...king_service_app/doctype/khatavahi_book_service_setting/khatavahi_book_service_setting.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ class KhatavahiBookServiceSetting(Document):
def validate(self):
if self.enable == 1:
setup_custom_fields()
setup_custom_script()


def setup_custom_fields():
Expand Down Expand Up @@ -45,24 +44,3 @@ def setup_custom_fields():

create_custom_fields(custom_fields)
frappe.msgprint("Custom Field Updated!")


def setup_custom_script(ignore_validate=False):
if not frappe.db.exists("Client Script", "Item-Client"):
custom_script = frappe.get_doc({
"doctype": "Client Script",
"name": "Rental Module",
"dt": "Item",
"enabled": True,
"script": """
frappe.ui.form.on('Item', {
booking_item: function(frm) {
if(frm.doc.booking_item == 0){
frm.doc.service_item = ""
}
}
})
"""
})
custom_script.flags.ignore_validate = ignore_validate
custom_script.insert()
7 changes: 7 additions & 0 deletions bookingapp/public/js/bookingapp_item.js
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
frappe.ui.form.on('Item', {
booking_item: function(frm) {
if(frm.doc.booking_item == 0){
frm.doc.service_item = ""
}
}
})

0 comments on commit 3d59993

Please sign in to comment.